Merge remote-tracking branch 'upstream/master' into ice

50 files changed, 11819 insertions, 5178 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 7b6004ce0..5a71733b8 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1055,7 +1055,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
             {
             case 0:
             {
-                const struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1064,9 +1064,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0);
                 break;
             }
-            case 1:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET:
             {
-                const struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1081,9 +1081,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 }
                 break;
             }
-            case 2:
+            case F_TRAINER_PARTY_HELD_ITEM:
             {
-                const struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
@@ -1094,9 +1094,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum)
                 SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem);
                 break;
             }
-            case 3:
+            case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
             {
-                const struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party;
+                const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves;
 
                 for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++)
                     nameHash += gSpeciesNames[partyData[i].species][j];
diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c
index 0e9c45023..6edc56549 100644
--- a/src/battle/battle_anim_812C144.c
+++ b/src/battle/battle_anim_812C144.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
+#include "blend_palette.h"
 #include "contest.h"
 #include "data2.h"
 #include "decompress.h"
@@ -18,6 +19,7 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 extern u8 gAnimVisualTaskCount;
+extern u8 gAnimFriendship;
 extern s32 gAnimMoveDmg;
 extern u16 gBattle_WIN0H;
 extern u16 gBattle_WIN0V;
@@ -30,6 +32,9 @@ extern u16 gBattle_BG2_Y;
 
 extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220;
 extern const struct SpriteTemplate gSpriteTemplate_8402500;
+extern const struct SpriteTemplate gSpriteTemplate_84028CC;
+extern const struct SpriteTemplate gSpriteTemplate_840294C;
+extern const struct SpriteTemplate gSpriteTemplate_84029AC;
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[];
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[];
 extern const union AffineAnimCmd gUnknown_08402400[];
@@ -38,6 +43,9 @@ extern const union AffineAnimCmd gUnknown_08402518[];
 extern const union AffineAnimCmd gUnknown_08402540[];
 extern const union AffineAnimCmd gUnknown_08402590[];
 extern const union AffineAnimCmd gUnknown_08402610[];
+extern const union AffineAnimCmd gUnknown_08402750[];
+extern const union AffineAnimCmd gUnknown_084028AC[];
+extern const union AffineAnimCmd gUnknown_084029DC[];
 extern const u32 gUnknown_08D2AA98[];
 extern const u32 gUnknown_08D2A9E0[];
 extern const u16 gUnknown_08D2AA80[];
@@ -45,11 +53,17 @@ extern const s8 gUnknown_084025C0[];
 extern const s8 gUnknown_08402604[];
 extern const u8 gUnknown_08402608[];
 extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC;
+extern const u8 gUnknown_08D2E014[];
+extern const u8 gUnknown_08D2E170[];
+extern const u16 gUnknown_08D2E150[];
 extern u8 gBattleMonForms[];
 extern u8 gBankSpriteIds[];
 extern u16 gBattlerPartyIndexes[];
+extern s16 gUnknown_084028E4[];
 
 extern u8 sub_8046234(s16 x, s16 y, u8 a3);
+extern void sub_80DA48C(struct Sprite *);
+extern void sub_80E3C4C(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette);
 
 static void sub_812C184(struct Sprite *sprite);
 static void sub_812C268(struct Sprite *sprite);
@@ -82,7 +96,26 @@ static void sub_812EE00(struct Sprite *sprite);
 static void sub_812EEEC(struct Sprite *sprite);
 /*static*/ void sub_812F238(u8 taskId);
 static void sub_812F290(u8 taskId);
-void sub_812F474(u8 taskId);
+static void sub_812F474(u8 taskId);
+static void sub_812F76C(u8 taskId);
+static void sub_812F8DC(struct Sprite *sprite);
+static void sub_812FE20(u8 taskId);
+static void sub_812FEB8(u8, bool8);
+static void sub_813003C(u8 taskId);
+static void sub_81301B4(struct Sprite *sprite);
+static void sub_81302E4(u8 taskId);
+static void sub_8130424(s16, s16, s16, s16, u8, u8, s16*, s16*);
+static void sub_81306A4(u8 taskId);
+static void sub_813085C(struct Sprite *sprite);
+static void sub_8130970(u8 taskId);
+static void sub_8130A94(struct Sprite *sprite);
+static void sub_8130B38(struct Sprite *sprite);
+static void sub_8130DBC(u8 taskId);
+static void sub_8130FE0(struct Sprite *sprite);
+static void sub_8131408(u8 taskId);
+static void sub_81315C8(struct Sprite *sprite);
+static void sub_8131810(u8 taskId);
+static void sub_8131838(struct Sprite *sprite);
 
 
 void sub_812C144(struct Sprite *sprite)
@@ -2553,3 +2586,1557 @@ void sub_812F314(u8 taskId)
     ScanlineEffect_SetParams(scanlineParams);
     task->func = sub_812F474;
 }
+
+static void sub_812F474(u8 taskId)
+{
+    struct Task *task;
+    s16 var1;
+    s16 var2;
+    s16 bgX, bgY;
+    s16 offset;
+    s16 var0;
+    s16 i;
+    s16 sineIndex;
+    s16 var3;
+
+    task = &gTasks[taskId];
+    if (GetBattlerPosition_permutated(task->data[5]) == 1)
+    {
+        bgX = gBattle_BG1_X;
+        bgY = gBattle_BG1_Y;
+    }
+    else
+    {
+        bgX = gBattle_BG2_X;
+        bgY = gBattle_BG2_Y;
+    }
+
+    switch (task->data[0])
+    {
+    case 0:
+        offset = task->data[14] * 2;
+        var1 = 0;
+        var2 = 0;
+        i = 0;
+        task->data[1] = (task->data[1] + 2) & 0xFF;
+        sineIndex = task->data[1];
+        task->data[9] = 0x7E0 / task->data[6];
+        task->data[10] = -((task->data[7] * 2) / task->data[9]);
+        task->data[11] = task->data[7];
+        var3 = task->data[11] >> 5;
+        task->data[12] = var3;
+        var0 = task->data[14];
+        while (var0 > task->data[13])
+        {
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][offset + 1] = (i - var2) + bgY;
+            gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][offset] = bgX + var3 + (gSineTable[sineIndex] >> 5);
+            sineIndex = (sineIndex + 10) & 0xFF;
+            task->data[11] += task->data[10];
+            var3 = task->data[11] >> 5;
+            task->data[12] = var3;
+
+            i++;
+            offset -= 2;
+            var1 += task->data[6];
+            var2 = var1 >> 5;
+            var0--;
+        }
+
+        var0 *= 2;
+        while (var0 >= 0)
+        {
+            gScanlineEffectRegBuffers[0][var0] = bgX + 240;
+            gScanlineEffectRegBuffers[1][var0] = bgX + 240;
+            var0 -= 2;
+        }
+
+        if (++task->data[6] > 63)
+        {
+            task->data[6] = 64;
+            task->data[2]++;
+            if (task->data[2] & 1)
+                task->data[3]--;
+            else
+                task->data[4]++;
+
+            REG_BLDALPHA = (task->data[4] << 8) | task->data[3];
+            if (task->data[3] == 0 && task->data[4] == 16)
+            {
+                task->data[2] = 0;
+                task->data[3] = 0;
+                task->data[0]++;
+            }
+        }
+        else
+        {
+            task->data[7] += task->data[8];
+        }
+        break;
+    case 1:
+        if (++task->data[2] > 12)
+        {
+            gScanlineEffect.state = 3;
+            task->data[2] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 2:
+        task->data[2]++;
+        if (task->data[2] & 1)
+            task->data[3]++;
+        else
+            task->data[4]--;
+
+        REG_BLDALPHA = (task->data[4] << 8) | task->data[3];
+        if (task->data[3] == 16 && task->data[4] == 0)
+        {
+            task->data[2] = 0;
+            task->data[3] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 3:
+        DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+void sub_812F724(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    task->data[0] = 0;
+    task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
+    sub_80798F4(&gTasks[taskId], task->data[15], &gUnknown_08402750);
+    task->func = sub_812F76C;
+}
+
+static void sub_812F76C(u8 taskId)
+{
+    u16 var0;
+
+    struct Task *task = &gTasks[taskId];
+    var0 = task->data[0];
+    task->data[0]++;
+    var0 -= 20;
+    if (var0 < 23)
+    {
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            task->data[2]++;
+            if (task->data[2] & 1)
+                gSprites[task->data[15]].pos2.x = 1;
+            else
+                gSprites[task->data[15]].pos2.x = -1;
+        }
+    }
+    else
+    {
+        gSprites[task->data[15]].pos2.x = 0;
+    }
+
+    if (!sub_807992C(&gTasks[taskId]))
+        DestroyAnimVisualTask(taskId);
+}
+
+static void sub_812F804(struct Sprite *sprite, s16 b, s16 c, s16 d, s16 e, u16 f)
+{
+    sprite->pos1.x = b;
+    sprite->pos1.y = c;
+    sprite->data[4] = b << 4;
+    sprite->data[5] = c << 4;
+    sprite->data[6] = ((d - b) << 4) / f;
+    sprite->data[7] = ((e - c) << 4) / f;
+}
+
+void sub_812F86C(struct Sprite *sprite)
+{
+    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;
+}
+
+void sub_812F88C(struct Sprite *sprite)
+{
+    s16 x = sprite->pos1.x;
+    s16 y = sprite->pos1.y;
+
+    sub_8078650(sprite);
+    StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]);
+    sub_812F804(sprite, sprite->pos1.x, sprite->pos1.y, x, y, 64);
+    sprite->data[0] = 0;
+    sprite->callback = sub_812F8DC;
+}
+
+static void sub_812F8DC(struct Sprite *sprite)
+{
+    int index;
+
+    sprite->data[0]++;
+    index = (sprite->data[0] * 8) & 0xFF;
+    sub_812F86C(sprite);
+    sprite->pos2.y = Sin(index, 8);
+    if (sprite->data[0] > 58)
+    {
+        if (++sprite->data[1] > 1)
+        {
+            sprite->data[1] = 0;
+            sprite->data[2]++;
+            sprite->invisible = sprite->data[2] & 1;
+            if (sprite->data[2] > 3)
+                move_anim_8074EE0(sprite);
+        }
+    }
+}
+
+void sub_812F948(struct Sprite *sprite)
+{
+    sprite->data[0] = gBattleAnimArgs[3];
+    StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]);
+    if (GetBattlerSide(gAnimBankTarget) != B_SIDE_PLAYER)
+        gBattleAnimArgs[1] = -gBattleAnimArgs[1];
+
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[1];
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2];
+    sprite->callback = sub_80DA48C;
+}
+
+static void sub_812F9B0(u8 taskId)
+{
+    u16 var0 = 0;
+    u16 var1 = 0;
+
+    gTasks[taskId].data[0]--;
+    if ((gTasks[taskId].data[6] & 0x8000) && (--gTasks[taskId].data[1] == -1))
+    {
+        if (gTasks[taskId].data[9] == 0)
+        {
+            gTasks[taskId].data[9] = gTasks[taskId].data[4];
+            gTasks[taskId].data[4] = -gTasks[taskId].data[4];
+        }
+        else
+        {
+            gTasks[taskId].data[9] = 0;
+        }
+
+        if (gTasks[taskId].data[10] == 0)
+        {
+            gTasks[taskId].data[10] = gTasks[taskId].data[5];
+            gTasks[taskId].data[5] = -gTasks[taskId].data[5];
+        }
+        else
+        {
+            gTasks[taskId].data[10] = 0;
+        }
+
+        gTasks[taskId].data[1] = gTasks[taskId].data[13];
+    }
+
+    var0 = gTasks[taskId].data[7];
+    var1 = gTasks[taskId].data[8];
+    if (gTasks[taskId].data[2] & 0x8000)
+        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8);
+    else
+        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8);
+
+    if (gTasks[taskId].data[3] & 0x8000)
+        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8);
+    else
+        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8);
+
+    if (gTasks[taskId].data[0] < 1)
+    {
+        DestroyTask(taskId);
+        gAnimVisualTaskCount--;
+    }
+}
+
+static void sub_812FAF8(u8 taskId)
+{
+    u16 var0 = 0;
+    u16 var1 = 0;
+
+    gTasks[taskId].data[0]--;
+    if ((gTasks[taskId].data[6] & 0x8000) && (--gTasks[taskId].data[1] == -1))
+    {
+        if (gTasks[taskId].data[9] == 0)
+        {
+            gTasks[taskId].data[9] = gTasks[taskId].data[4];
+            gTasks[taskId].data[4] = -gTasks[taskId].data[4];
+        }
+        else
+        {
+            gTasks[taskId].data[9] = var0;
+        }
+
+        if (gTasks[taskId].data[10] == 0)
+        {
+            gTasks[taskId].data[10] = gTasks[taskId].data[5];
+            gTasks[taskId].data[5] = -gTasks[taskId].data[5];
+        }
+        else
+        {
+            gTasks[taskId].data[10] = 0;
+        }
+
+        gTasks[taskId].data[1] = gTasks[taskId].data[13];
+    }
+
+    var0 = (gTasks[taskId].data[2] & 0x7FFF) + gTasks[taskId].data[7];
+    var1 = (gTasks[taskId].data[3] & 0x7FFF) + gTasks[taskId].data[8];
+    if (gTasks[taskId].data[2] & 0x8000)
+        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8);
+    else
+        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8);
+
+    if (gTasks[taskId].data[3] & 0x8000)
+        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8);
+    else
+        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8);
+
+    gTasks[taskId].data[7] = var0;
+    gTasks[taskId].data[8] = var1;
+    if (gTasks[taskId].data[0] < 1)
+    {
+        gTasks[taskId].data[0] = 30;
+        gTasks[taskId].data[13] = 0;
+        gTasks[taskId].func = sub_812F9B0;
+    }
+}
+
+void sub_812FC68(u8 taskId)
+{
+    gTasks[taskId].data[15] = gBankSpriteIds[gAnimBankAttacker];
+    gTasks[taskId].data[14] = gBattleAnimArgs[0];
+    gTasks[taskId].data[0] = gBattleAnimArgs[0];
+    gTasks[taskId].data[13] = gBattleAnimArgs[6];
+    if (gBattleAnimArgs[3])
+        gTasks[taskId].data[6] = gTasks[taskId].data[6] | -0x8000;
+
+    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    {
+        gTasks[taskId].data[2] = gBattleAnimArgs[1];
+        gTasks[taskId].data[3] = gBattleAnimArgs[2];
+    }
+    else
+    {
+        if (gBattleAnimArgs[1] & 0x8000)
+            gTasks[taskId].data[2] = gBattleAnimArgs[1] & 0x7FFF;
+        else
+            gTasks[taskId].data[2] = gBattleAnimArgs[1] | -0x8000;
+
+        if (gBattleAnimArgs[2] & 0x8000)
+            gTasks[taskId].data[3] = gBattleAnimArgs[2] & 0x7FFF;
+        else
+            gTasks[taskId].data[3] = gBattleAnimArgs[2] | -0x8000;
+    }
+
+    gTasks[taskId].data[8] = 0;
+    gTasks[taskId].data[7] = 0;
+    gTasks[taskId].data[4] = gBattleAnimArgs[4];
+    gTasks[taskId].data[5] = gBattleAnimArgs[5];
+    gTasks[taskId].func = sub_812FAF8;
+}
+
+void sub_812FD7C(u8 taskId)
+{
+    u8 battler;
+    struct Task *task = &gTasks[taskId];
+
+    if (gBattleAnimArgs[1] == 0)
+        DestroyAnimVisualTask(taskId);
+    
+    task->data[0] = 0;
+    task->data[1] = 0;
+    task->data[2] = 0;
+    task->data[3] = gBattleAnimArgs[1];
+    if (gBattleAnimArgs[0] == 0)
+        battler = gAnimBankAttacker;
+    else
+        battler = gAnimBankTarget;
+
+    task->data[4] = GetBattlerSpriteCoord(battler, 0);
+    task->data[5] = GetBattlerSpriteCoord(battler, 1);
+    task->data[6] = sub_8079E90(battler);
+    task->data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
+    sub_80798F4(task, task->data[15], &gUnknown_084028AC);
+    task->func = sub_812FE20;
+}
+
+static void sub_812FE20(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        if (++task->data[1] == 6)
+            sub_812FEB8(taskId, TRUE);
+
+        if (task->data[1] == 18)
+            sub_812FEB8(taskId, FALSE);
+
+        if (!sub_807992C(task))
+        {
+            if (--task->data[3] == 0)
+            {
+                task->data[0]++;
+            }
+            else
+            {
+                task->data[1] = 0;
+                sub_80798F4(task, task->data[15], &gUnknown_084028AC);
+            }
+        }
+        break;
+    case 1:
+        if (task->data[2] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+static void sub_812FEB8(u8 taskId, bool8 arg1)
+{
+    u8 i;
+    s8 xOffset, yOffset;
+    struct Task *task;
+    s16 xCoords[4];
+    s16 yCoords[2];
+
+    task = &gTasks[taskId];
+    if (!arg1)
+    {
+        xOffset = 18;
+        yOffset = -20;
+    }
+    else
+    {
+        xOffset = 30;
+        yOffset = 20;
+    }
+
+    xCoords[0] = task->data[4] - xOffset;
+    xCoords[1] = task->data[4] - xOffset - 4;
+    xCoords[2] = task->data[4] + xOffset;
+    xCoords[3] = task->data[4] + xOffset + 4;
+    yCoords[0] = task->data[5] + yOffset;
+    yCoords[1] = task->data[5] + yOffset + 6;
+
+    for (i = 0; i < 4; i++)
+    {
+        u8 spriteId = CreateSprite(&gSpriteTemplate_84028CC, xCoords[i], yCoords[i & 1], task->data[6] - 5);
+        if (spriteId != MAX_SPRITES)
+        {
+            gSprites[spriteId].data[0] = 0;
+            gSprites[spriteId].data[1] = i < 2 ? -2 : 2;
+            gSprites[spriteId].data[2] = -1;
+            gSprites[spriteId].data[3] = taskId;
+            gSprites[spriteId].data[4] = 2;
+            task->data[2]++;
+        }
+    }
+}
+
+void sub_812FF94(struct Sprite *sprite)
+{
+    sprite->pos1.x += sprite->data[1];
+    sprite->pos1.y += sprite->data[2];
+    if (++sprite->data[0] > 6)
+    {
+        gTasks[sprite->data[3]].data[sprite->data[4]]--;
+        DestroySprite(sprite);
+    }
+}
+
+void sub_812FFE4(u8 taskId)
+{
+    u8 spriteId;
+
+    gTasks[taskId].data[0] = 0;
+    gTasks[taskId].data[1] = gBattleAnimArgs[1];
+    spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
+    gTasks[taskId].data[2] = 0x100 + gSprites[spriteId].oam.paletteNum * 16;
+    gTasks[taskId].func = sub_813003C;
+}
+
+static void sub_813003C(u8 taskId)
+{
+    if (gTasks[taskId].data[1])
+    {
+        BlendPalette(gTasks[taskId].data[2], 16, 8, gUnknown_084028E4[gTasks[taskId].data[0]]);
+        if (++gTasks[taskId].data[0] > 23)
+            gTasks[taskId].data[0] = 0;
+        
+        gTasks[taskId].data[1]--;
+    }
+    else
+    {
+        BlendPalette(gTasks[taskId].data[2], 16, 0, RGB(0, 0, 0));
+        DestroyAnimVisualTask(taskId);
+    }
+}
+
+void sub_81300A4(u8 taskId)
+{
+    sub_80E3C4C(
+        taskId,
+        0,
+        0x1A0,
+        gAnimBankAttacker,
+        gBattleAnimArgs[0],
+        10,
+        2,
+        30,
+        gUnknown_08D2E014,
+        gUnknown_08D2E170,
+        gUnknown_08D2E150);
+}
+
+void sub_81300F4(struct Sprite *sprite)
+{
+    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+        gBattleAnimArgs[0] = -gBattleAnimArgs[0];
+    
+    sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+    if (gBattleAnimArgs[2] == 0)
+    {
+        sprite->data[0] = 640;
+        sprite->data[1] = -640;
+    }
+    else if (gBattleAnimArgs[2] == 1)
+    {
+        sprite->vFlip = 1;
+        sprite->data[0] = 640;
+        sprite->data[1] = 640;
+    }
+    else
+    {
+        StartSpriteAnim(sprite, 1);
+        sprite->data[0] = 640;
+    }
+
+    if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER)
+    {
+        sprite->data[0] = -sprite->data[0];
+        sprite->hFlip = 1;
+    }
+
+    sprite->callback = sub_81301B4;
+}
+
+static void sub_81301B4(struct Sprite *sprite)
+{
+    sprite->data[6] += sprite->data[0];
+    sprite->data[7] += sprite->data[1];
+    sprite->pos2.x = sprite->data[6] >> 8;
+    sprite->pos2.y = sprite->data[7] >> 8;
+    if (++sprite->data[5] == 14)
+        DestroyAnimSprite(sprite);
+}
+
+void sub_81301EC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (IsContest())
+    {
+        task->data[5] = 8;
+        task->data[6] = 3;
+        task->data[7] = 1;
+    }
+    else
+    {
+        task->data[5] = 12;
+        task->data[6] = 3;
+        task->data[7] = 0;
+    }
+
+    if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+        task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + sub_807A100(gAnimBankAttacker, 0) / 4;
+    else
+        task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - sub_807A100(gAnimBankAttacker, 0) / 4;
+
+    task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) - sub_807A100(gAnimBankAttacker, 0) / 4;
+    task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    task->func = sub_81302E4;
+}
+
+static void sub_81302E4(u8 taskId)
+{
+    u8 i;
+    s16 x, y;
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        if (++task->data[1] > 3)
+        {
+            task->data[1] = 0;
+            sub_8130424(
+                task->data[11],
+                task->data[12],
+                task->data[13],
+                task->data[14],
+                task->data[5],
+                task->data[2],
+                &x,
+                &y);
+
+            for (i = 0; i < 2; i++)
+            {
+                u8 spriteId = CreateSprite(&gSpriteTemplate_840294C, x, y, 35);
+                if (spriteId != MAX_SPRITES)
+                {
+                    if (task->data[7] == 0)
+                    {
+                        if (i == 0)
+                            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = -task->data[6];
+                        else
+                            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = task->data[6];
+                    }
+                    else
+                    {
+                        if (i == 0)
+                        {
+                            gSprites[spriteId].pos2.x = -task->data[6];
+                            gSprites[spriteId].pos2.y = task->data[6];
+                        }
+                        else
+                        {
+                            gSprites[spriteId].pos2.x = task->data[6];
+                            gSprites[spriteId].pos2.y = -task->data[6];
+                        }
+                    }
+
+                    gSprites[spriteId].data[0] = 0;
+                    gSprites[spriteId].data[1] = taskId;
+                    gSprites[spriteId].data[2] = 10;
+                    task->data[10]++;
+                }
+            }
+
+            if (task->data[2] == task->data[5])
+                task->data[0]++;
+
+            task->data[2]++;
+        }
+        break;
+    case 1:
+        if (task->data[10] == 0)
+            DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+static void sub_8130424(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, s16 *x, s16 *y)
+{
+    int x2;
+    int y2;
+
+    if (arg5 == 0)
+    {
+        *x = arg0;
+        *y = arg1;
+        return;
+    }
+
+    if (arg5 >= arg4)
+    {
+        *x = arg2;
+        *y = arg3;
+        return;
+    }
+
+    arg4--;
+    x2 = (arg0 << 8) + arg5 * (((arg2 - arg0) << 8) / arg4);
+    y2 = (arg1 << 8) + arg5 * (((arg3 - arg1) << 8) / arg4);
+    *x = x2 >> 8;
+    *y = y2 >> 8;
+}
+
+void sub_81304DC(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 36)
+    {
+        gTasks[sprite->data[1]].data[sprite->data[2]]--;
+        DestroySprite(sprite);
+    }
+}
+
+void sub_813051C(struct Sprite *sprite)
+{
+    sprite->pos1.x = gBattleAnimArgs[0];
+    sprite->pos1.y = gBattleAnimArgs[1];
+    sprite->data[2] = gBattleAnimArgs[2];
+    sprite->data[4] = gBattleAnimArgs[3];
+    sprite->data[0] = gBattleAnimArgs[4];
+    StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
+    sprite->callback = sub_8078CC0;
+}
+
+void sub_8130554(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[11] = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+    task->data[12] = GetBattlerSpriteCoord(gAnimBankAttacker, 3);
+    task->data[13] = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+    task->data[14] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + sub_807A100(gAnimBankTarget, 0) / 4;
+    task->data[15] = CreateSprite(&gSpriteTemplate_84029AC, task->data[11], task->data[12], sub_8079E90(gAnimBankTarget) - 5);
+    if (task->data[15] != MAX_SPRITES)
+    {
+        gSprites[task->data[15]].data[0] = 16;
+        gSprites[task->data[15]].data[2] = task->data[13];
+        gSprites[task->data[15]].data[4] = task->data[14];
+        gSprites[task->data[15]].data[5] = -32;
+        InitAnimArcTranslation(&gSprites[task->data[15]]);
+        if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT)
+            StartSpriteAffineAnim(&gSprites[task->data[15]], 1);
+        
+        task->func = sub_81306A4;
+    }
+    else
+    {
+        DestroyAnimVisualTask(taskId);
+    }
+}
+
+static void sub_81306A4(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            TranslateAnimArc(&gSprites[task->data[15]]);
+            if (++task->data[2] > 7)
+                task->data[0]++;
+        }
+        break;
+    case 1:
+        if (TranslateAnimArc(&gSprites[task->data[15]]))
+        {
+            task->data[1] = 0;
+            task->data[2] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 2:
+        if (++task->data[1] > 1)
+        {
+            task->data[1] = 0;
+            task->data[2]++;
+            gSprites[task->data[15]].invisible = task->data[2] & 1;
+            if (task->data[2] == 16)
+            {
+                FreeOamMatrix(gSprites[task->data[15]].oam.matrixNum);
+                DestroySprite(&gSprites[task->data[15]]);
+                task->data[0]++;
+            }
+        }
+        break;
+    case 3:
+        DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+void sub_81307B0(struct Sprite *sprite)
+{
+    u8 battler;
+
+    if (gBattleAnimArgs[0] == 0)
+        battler = gAnimBankAttacker;
+    else
+        battler = gAnimBankTarget;
+
+    sprite->oam.tileNum += 16;
+    sprite->data[6] = gBattleAnimArgs[2];
+    sprite->data[7] = gBattleAnimArgs[1] == 0 ? -1 : 1;
+    sprite->pos1.y = GetBattlerSpriteCoord(battler, 3);
+    if (gBattleAnimArgs[1] == 0)
+    {
+        sprite->oam.matrixNum |= 0x8;
+        sprite->pos1.x = sub_807A100(battler, 4) - 8;
+    }
+    else
+    {
+        sprite->pos1.x = sub_807A100(battler, 5) + 8;
+    }
+
+    sprite->callback = sub_813085C;
+}
+
+static void sub_813085C(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        if (++sprite->data[1] > 1)
+        {
+            sprite->data[1] = 0;
+            sprite->pos2.x += sprite->data[7];
+            if (++sprite->data[2] == 12)
+                sprite->data[0]++;
+        }
+        break;
+    case 1:
+        if (++sprite->data[1] == 8)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        sprite->pos2.x -= sprite->data[7] * 4;
+        if (++sprite->data[1] == 6)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 3:
+        sprite->pos2.x += sprite->data[7] * 3;
+        if (++sprite->data[1] == 8)
+        {
+            if (--sprite->data[6])
+            {
+                sprite->data[1] = 0;
+                sprite->data[0]--;
+            }
+            else
+            {
+                DestroyAnimSprite(sprite);
+            }
+        }
+        break;
+    }
+}
+
+void sub_8130918(u8 taskId)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        DestroyAnimVisualTask(taskId);
+    }
+    else
+    {
+        gTasks[taskId].data[0] = gBattleAnimArgs[1];
+        gTasks[taskId].data[15] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
+        sub_80798F4(&gTasks[taskId], gTasks[taskId].data[15], &gUnknown_084029DC);
+        gTasks[taskId].func = sub_8130970;
+    }
+}
+
+static void sub_8130970(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (++task->data[1] > 1)
+    {
+        task->data[1] = 0;
+        if (!(task->data[2] & 1))
+            gSprites[task->data[15]].pos2.x = 2;
+        else
+            gSprites[task->data[15]].pos2.x = -2;
+    }
+
+    if (!sub_807992C(task))
+    {
+        gSprites[task->data[15]].pos2.x = 0;
+        if (--task->data[0])
+        {
+            sub_80798F4(&gTasks[taskId], gTasks[taskId].data[15], &gUnknown_084029DC);
+            task->data[1] = 0;
+            task->data[2] = 0;
+        }
+        else
+        {
+            DestroyAnimVisualTask(taskId);
+        }
+    }
+}
+
+void sub_8130A2C(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2);
+        sprite->pos1.y = sub_807A100(gAnimBankAttacker, 2);
+    }
+    else
+    {
+        sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 2);
+        sprite->pos1.y = sub_807A100(gAnimBankTarget, 2);
+    }
+
+    if (sprite->pos1.y < 8)
+        sprite->pos1.y = 8;
+
+    sprite->data[0] = 0;
+    sprite->data[1] = gBattleAnimArgs[1];
+    sprite->data[2] = 0;
+    sprite->data[3] = gBattleAnimArgs[2];
+    sprite->callback = sub_8130A94;
+}
+
+static void sub_8130A94(struct Sprite *sprite)
+{
+    if (++sprite->data[0] >= sprite->data[1])
+    {
+        sprite->data[0] = 0;
+        sprite->data[2] = (sprite->data[2] + 1) & 1;
+        sprite->invisible = sprite->data[2];
+        if (sprite->data[2] && --sprite->data[3] == 0)
+            DestroyAnimSprite(sprite);
+    }
+}
+
+void sub_8130AEC(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        sprite->oam.matrixNum |= 0x8;
+        sprite->pos1.x = 100;
+        sprite->data[7] = 1;
+    }
+    else
+    {
+        sprite->pos1.x = 140;
+        sprite->data[7] = -1;
+    }
+
+    sprite->pos1.y = 56;
+    sprite->callback = sub_8130B38;
+}
+
+static void sub_8130B38(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        sprite->pos1.y -= sprite->data[7] * 2;
+        if (sprite->data[1] & 1)
+            sprite->pos1.x -= sprite->data[7] * 2;
+
+        if (++sprite->data[1] == 9)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 1:
+        if (++sprite->data[1] == 4)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        sprite->data[1]++;
+        sprite->pos1.y += sprite->data[7] * 3;
+        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        if (sprite->data[1] == 12)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 3:
+        if (++sprite->data[1] == 2)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 4:
+        sprite->data[1]++;
+        sprite->pos1.y -= sprite->data[7] * 3;
+        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        if (sprite->data[1] == 12)
+            sprite->data[0]++;
+        break;
+    case 5:
+        sprite->data[1]++;
+        sprite->pos1.y += sprite->data[7] * 3;
+        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        if (sprite->data[1] == 15)
+            sprite->oam.tileNum += 16;
+        
+        if (sprite->data[1] == 18)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 6:
+        sprite->pos1.x += sprite->data[7] * 6;
+        if (++sprite->data[1] == 9)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 7:
+        sprite->pos1.x += sprite->data[7] * 2;
+        if (++sprite->data[1] == 1)
+        {
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 8:
+        sprite->pos1.x -= sprite->data[7] * 3;
+        if (++sprite->data[1] == 5)
+            DestroyAnimSprite(sprite);
+        break;
+    }
+}
+
+void sub_8130D20(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    task->data[15] = GetAnimBattlerSpriteId(0);
+    if (!IsContest())
+    {
+        if (IsDoubleBattle() == TRUE)
+        {
+            int x = GetBattlerSpriteCoord(gAnimBankAttacker, 0);
+            int y = GetBattlerSpriteCoord(gAnimBankAttacker ^ 2, 0);
+            if (x > y)
+                task->data[14] = 1;
+            else
+                task->data[14] = -1;
+        }
+        else
+        {
+            if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER)
+                task->data[14] = -1;
+            else
+                task->data[14] = 1;
+        }
+    }
+    else
+    {
+        task->data[14] = 1;
+    }
+
+    task->func = sub_8130DBC;
+}
+
+static void sub_8130DBC(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    switch (task->data[0])
+    {
+    case 0:
+        if (++task->data[1] == 13)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 1:
+        gSprites[task->data[15]].pos2.x -= task->data[14] * 3;
+        if (++task->data[1] == 6)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 2:
+        gSprites[task->data[15]].pos2.x += task->data[14] * 3;
+        if (++task->data[1] == 6)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 3:
+        if (++task->data[1] == 2)
+        {
+            task->data[1] = 0;
+            if (task->data[2] == 0)
+            {
+                task->data[2]++;
+                task->data[0] = 1;
+            }
+            else
+            {
+                task->data[0]++;
+            }
+        }
+        break;
+    case 4:
+        gSprites[task->data[15]].pos2.x += task->data[14];
+        if (++task->data[1] == 3)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 5:
+        if (++task->data[1] == 6)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 6:
+        gSprites[task->data[15]].pos2.x -= task->data[14] * 4;
+        if (++task->data[1] == 5)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 7:
+        gSprites[task->data[15]].pos2.x += task->data[14] * 4;
+        if (++task->data[1] == 5)
+        {
+            task->data[1] = 0;
+            task->data[0]++;
+        }
+        break;
+    case 8:
+        gSprites[task->data[15]].pos2.x = 0;
+        DestroyAnimVisualTask(taskId);
+        break;
+    }
+}
+
+void sub_8130F5C(struct Sprite *sprite)
+{
+    if (gBattleAnimArgs[0] == 0)
+    {
+        InitAnimSpritePos(sprite, 1);
+        sprite->data[7] = gAnimBankAttacker;
+    }
+    else
+    {
+        sprite->data[7] = gAnimBankTarget;
+    }
+
+    if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT)
+        sprite->oam.matrixNum = 8;
+
+    sprite->oam.priority = sub_8079ED4(sprite->data[7]);
+    sprite->oam.objMode = ST_OAM_OBJ_BLEND;
+    sprite->callback = sub_8130FE0;
+}
+
+static void sub_8130FE0(struct Sprite *sprite)
+{
+    u16 x, y;
+
+    switch (sprite->data[5])
+    {
+    case 0:
+        switch (sprite->data[6])
+        {
+        default:
+            sprite->data[6] = 0;
+        case 0:
+        case 4:
+            x = sub_807A100(sprite->data[7], 5) - 4;
+            y = sub_807A100(sprite->data[7], 3) - 4;
+            break;
+        case 1:
+            x = sub_807A100(sprite->data[7], 5) - 4;
+            y = sub_807A100(sprite->data[7], 2) + 4;
+            break;
+        case 2:
+            x = sub_807A100(sprite->data[7], 4) + 4;
+            y = sub_807A100(sprite->data[7], 3) - 4;
+            break;
+        case 3:
+            x = sub_807A100(sprite->data[7], 4) + 4;
+            y = sub_807A100(sprite->data[7], 2) - 4;
+            break;
+        case 5:
+            x = GetBattlerSpriteCoord(sprite->data[7], 2);
+            y = GetBattlerSpriteCoord(sprite->data[7], 3);
+            break;
+        }
+
+        if (sprite->data[6] == 4)
+            sprite->data[0] = 24;
+        else if (sprite->data[6] == 5)
+            sprite->data[0] = 6;
+        else
+            sprite->data[0] = 12;
+
+        sprite->data[1] = sprite->pos1.x;
+        sprite->data[2] = x;
+        sprite->data[3] = sprite->pos1.y;
+        sprite->data[4] = y;
+        InitAnimLinearTranslation(sprite);
+        sprite->data[5]++;
+        break;
+    case 1:
+        if (TranslateAnimLinear(sprite))
+        {
+            switch (sprite->data[6])
+            {
+            default:
+                sprite->pos1.x += sprite->pos2.x;
+                sprite->pos1.y += sprite->pos2.y;
+                sprite->pos2.y = 0;
+                sprite->pos2.x = 0;
+                sprite->data[0] = 0;
+                sprite->data[5]++;
+                sprite->data[6]++;
+                break;
+            case 4:
+                sprite->pos1.x += sprite->pos2.x;
+                sprite->pos1.y += sprite->pos2.y;
+                sprite->pos2.y = 0;
+                sprite->pos2.x = 0;
+                sprite->data[5] = 0;
+                sprite->data[6]++;
+                break;
+            case 5:
+                sprite->data[0] = 0;
+                sprite->data[1] = 16;
+                sprite->data[2] = 0;
+                sprite->data[5] = 3;
+                break;
+            }
+        }
+        break;
+    case 2:
+        if (++sprite->data[0] == 4)
+            sprite->data[5] = 0;
+        break;
+    case 3:
+        if (!(sprite->data[0] & 1))
+            sprite->data[1]--;
+        else
+            sprite->data[2]++;
+
+        REG_BLDALPHA = (sprite->data[2] << 8) | sprite->data[1];
+        if (++sprite->data[0] == 32)
+        {
+            sprite->invisible = 1;
+            sprite->data[5]++;
+        }
+        break;
+    case 4:
+        DestroyAnimSprite(sprite);
+        break;
+    }
+}
+
+static void sub_81311E4(struct Sprite *sprite)
+{
+    sprite->pos2.x = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4];
+    sprite->pos2.y = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4];
+    if (!(sprite->data[5] & 1))
+    {
+        CreateSprite(
+            &gSpriteTemplate_8402500,
+            sprite->pos1.x + sprite->pos2.x,
+            sprite->pos1.y + sprite->pos2.y, 5);
+    }
+    
+    if (sprite->data[5] == sprite->data[4])
+        DestroyAnimSprite(sprite);
+
+    sprite->data[5]++;
+}
+
+void sub_8131264(struct Sprite *sprite)
+{
+    GetBattlerSpriteCoord(gAnimBankTarget, 2); // unused local variable
+    GetBattlerSpriteCoord(gAnimBankTarget, 3); // unused local variable
+
+    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER || IsContest())
+    {
+        sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0];
+        sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2];
+    }
+    else
+    {
+        sprite->data[0] = sprite->pos1.x + gBattleAnimArgs[0];
+        sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+    }
+
+    sprite->data[1] = sprite->pos1.y + gBattleAnimArgs[1];
+    sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[3];
+    sprite->data[4] = gBattleAnimArgs[4];
+    sprite->pos1.x = sprite->data[0];
+    sprite->pos1.y = sprite->data[1];
+    sprite->callback = sub_81311E4;
+}
+
+void sub_81312E4(u8 taskId)
+{
+    int i;
+    u8 spriteId = GetAnimBattlerSpriteId(0);
+
+    if (gTasks[taskId].data[0] == 0)
+    {
+        sub_8078E70(spriteId, 0);
+        gTasks[taskId].data[1] = 0x100;
+        gTasks[taskId].data[2] = 0x100;
+        gTasks[taskId].data[0]++;
+    }
+    else if (gTasks[taskId].data[0] == 1)
+    {
+        gTasks[taskId].data[1] += 0x60;
+        gTasks[taskId].data[2] -= 0xD;
+        obj_id_set_rotscale(spriteId, gTasks[taskId].data[1], gTasks[taskId].data[2], 0);
+        if (++gTasks[taskId].data[3] == 9)
+        {
+            gTasks[taskId].data[3] = 0;
+            sub_8078F40(spriteId);
+            gSprites[spriteId].invisible = 1;
+            gTasks[taskId].data[0]++;
+        }
+    }
+    else
+    {
+        refresh_graphics_maybe(gAnimBankAttacker, 0, spriteId);
+        if (IsContest())
+        {
+            gSprites[gBankSpriteIds[gAnimBankAttacker]].affineAnims = gSpriteAffineAnimTable_81E7C18;
+            StartSpriteAffineAnim(&gSprites[gBankSpriteIds[gAnimBankAttacker]], 0);
+        }
+
+        for (i = 0; i < 16; i++)
+            gTasks[taskId].data[i] = 0;
+        
+        gTasks[taskId].func = sub_8131408;
+    }
+}
+
+static void sub_8131408(u8 taskId)
+{
+    u8 spriteId = GetAnimBattlerSpriteId(0);
+
+    switch (gTasks[taskId].data[0])
+    {
+    case 0:
+        gSprites[spriteId].pos2.y = -200;
+        gSprites[spriteId].pos2.x = 200;
+        gSprites[spriteId].invisible = 0;
+        gTasks[taskId].data[10] = 0;
+        gTasks[taskId].data[0]++;
+        break;
+    case 1:
+        gTasks[taskId].data[10] += 112;
+        gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8;
+        if (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y >= -32)
+            gSprites[spriteId].pos2.x = 0;
+
+        if (gSprites[spriteId].pos2.y > 0)
+            gSprites[spriteId].pos2.y = 0;
+
+        if (gSprites[spriteId].pos2.y == 0)
+        {
+            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            gTasks[taskId].data[10] -= 0x800;
+            gTasks[taskId].data[0]++;
+        }
+        break;
+    case 2:
+        gTasks[taskId].data[10] -= 112;
+        if (gTasks[taskId].data[10] < 0)
+            gTasks[taskId].data[10] = 0;
+
+        gSprites[spriteId].pos2.y -= gTasks[taskId].data[10] >> 8;
+        if (gTasks[taskId].data[10] == 0)
+            gTasks[taskId].data[0]++;
+        break;
+    case 3:
+        gTasks[taskId].data[10] += 112;
+        gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8;
+        if (gSprites[spriteId].pos2.y > 0)
+            gSprites[spriteId].pos2.y = 0;
+
+        if (gSprites[spriteId].pos2.y == 0)
+        {
+            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            DestroyAnimVisualTask(taskId);
+        }
+        break;
+    }
+}
+
+void sub_8131564(struct Sprite *sprite)
+{
+    s16 y2;
+
+    if (GetBattlerSide(gAnimBankTarget) == B_SIDE_PLAYER)
+    {
+        sprite->subpriority = sub_8079E90(gAnimBankTarget) - 2;
+        y2 = -144;
+    }
+    else
+    {
+        sprite->subpriority = sub_8079E90(gAnimBankTarget) + 2;
+        y2 = -96;
+    }
+
+    sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 3);
+    sprite->pos2.y = y2;
+    sprite->callback = sub_81315C8;
+}
+
+static void sub_81315C8(struct Sprite *sprite)
+{
+    switch (sprite->data[0])
+    {
+    case 0:
+        sprite->pos2.y += 10;
+        if (sprite->pos2.y >= 0)
+        {
+            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            sprite->pos2.y = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 1:
+        sprite->data[1] += 4;
+        sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
+        if (sprite->data[1] > 127)
+        {
+            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            sprite->data[1] = 0;
+            sprite->pos2.y = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 2:
+        sprite->data[1] += 6;
+        sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 4);
+        if (sprite->data[1] > 127)
+        {
+            sprite->data[1] = 0;
+            sprite->pos2.y = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 3:
+        if (++sprite->data[1] > 8)
+        {
+            PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+            sprite->data[1] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 4:
+        if (++sprite->data[1] > 8)
+        {
+            sprite->data[1] = 0;
+            sprite->data[2]++;
+            sprite->invisible = sprite->data[2] & 1;
+            if (sprite->data[2] == 7)
+                DestroyAnimSprite(sprite);
+        }
+        break;
+    }
+}
+
+void sub_81316F8(u8 taskId)
+{
+    s16 spriteId1, spriteId2;
+
+    if (IsContest())
+    {
+        DestroyAnimVisualTask(taskId);
+        return;
+    }
+
+    spriteId1 = duplicate_obj_of_side_rel2move_in_transparent_mode(1);
+    if (spriteId1 < 0)
+    {
+        DestroyAnimVisualTask(taskId);
+        return;
+    }
+
+    spriteId2 = duplicate_obj_of_side_rel2move_in_transparent_mode(1);
+    if (spriteId2 < 0)
+    {
+        obj_delete_but_dont_free_vram(&gSprites[spriteId1]);
+        DestroyAnimVisualTask(taskId);
+        return;
+    }
+
+    gSprites[spriteId2].pos2.x += 24;
+    gSprites[spriteId1].pos2.x -= 24;
+    gSprites[spriteId2].data[0] = 0;
+    gSprites[spriteId1].data[0] = 0;
+    gSprites[spriteId2].data[1] = 0;
+    gSprites[spriteId1].data[1] = 0;
+    gSprites[spriteId2].data[2] = 0;
+    gSprites[spriteId1].data[2] = 0;
+    gSprites[spriteId2].data[3] = 16;
+    gSprites[spriteId1].data[3] = -16;
+    gSprites[spriteId2].data[4] = 0;
+    gSprites[spriteId1].data[4] = 128;
+    gSprites[spriteId2].data[5] = 24;
+    gSprites[spriteId1].data[5] = 24;
+    gSprites[spriteId2].data[6] = taskId;
+    gSprites[spriteId1].data[6] = taskId;
+    gSprites[spriteId2].data[7] = 0;
+    gSprites[spriteId1].data[7] = 0;
+    gTasks[taskId].data[0] = 2;
+    gSprites[spriteId2].invisible = 0;
+    gSprites[spriteId1].invisible = 1;
+    gSprites[spriteId2].oam.objMode = ST_OAM_OBJ_NORMAL;
+    gSprites[spriteId1].oam.objMode = ST_OAM_OBJ_NORMAL;
+    gSprites[spriteId2].callback = sub_8131838;
+    gSprites[spriteId1].callback = sub_8131838;
+    gTasks[taskId].func = sub_8131810;
+}
+
+static void sub_8131810(u8 taskId)
+{
+    if (gTasks[taskId].data[0] == 0)
+        DestroyAnimVisualTask(taskId);
+}
+
+static void sub_8131838(struct Sprite *sprite)
+{
+    if (++sprite->data[1] > 1)
+    {
+        sprite->data[1] = 0;
+        sprite->invisible ^= 1;
+    }
+
+    sprite->data[4] = (sprite->data[4] + sprite->data[3]) & 0xFF;
+    sprite->pos2.x = Cos(sprite->data[4], sprite->data[5]);
+    switch (sprite->data[0])
+    {
+    case 0:
+        if (++sprite->data[2] == 60)
+        {
+            sprite->data[2] = 0;
+            sprite->data[0]++;
+        }
+        break;
+    case 1:
+        if (++sprite->data[2] > 0)
+        {
+            sprite->data[2] = 0;
+            sprite->data[5] -= 2;
+            if (sprite->data[5] < 0)
+            {
+                gTasks[sprite->data[6]].data[sprite->data[7]]--;
+                obj_delete_but_dont_free_vram(sprite);
+            }
+        }
+        break;
+    }
+}
diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c
index 219395baf..f112c59aa 100755
--- a/src/battle/battle_anim_813F0F4.c
+++ b/src/battle/battle_anim_813F0F4.c
@@ -36,13 +36,13 @@ extern u8 gEffectBank;
 extern const u8 gUnknown_08D2EE48[];
 extern const u8 gUnknown_08D2EDFC[];
 extern const u16 gUnknown_08D2E150[];
-extern const struct CompressedSpritePalette gUnknown_0840B2B8[];
-extern const struct SpriteTemplate gSpriteTemplate_840B3B4[];
+extern const struct CompressedSpritePalette gBallOpenParticlePalettes[];
+extern const struct SpriteTemplate gSpriteTemplates_840B3B4[];
 extern const struct SpriteTemplate gSpriteTemplate_8402500;
 extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8;
-extern const u8 gUnknown_0840B378[];
-extern const struct CompressedSpriteSheet gUnknown_0840B258[];
-extern const TaskFunc gUnknown_0840B384[];
+extern const u8 gBallOpenParticleAnimNums[];
+extern const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[];
+extern const TaskFunc gBallOpenParticleAnimationFuncs[];
 extern const u16 gUnknown_0840B4D4[];
 extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
 extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
@@ -69,12 +69,12 @@ static void sub_81404E4(struct Sprite *sprite);
 static void sub_81405C8(struct Sprite *sprite);
 static void sub_81406BC(struct Sprite *sprite);
 static void sub_81407F4(struct Sprite *sprite);
-static void sub_8140A08(struct Sprite *sprite);
-static void sub_8140A28(struct Sprite *sprite);
-static void sub_8141294(struct Sprite *sprite);
-static void sub_8140ECC(struct Sprite *sprite);
-static void sub_8140FF8(struct Sprite *sprite);
-static void sub_8141230(struct Sprite *sprite);
+static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite);
+static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite);
+static void DestroyBallOpenAnimationParticle(struct Sprite *sprite);
+static void FanOutBallOpenParticles_Step1(struct Sprite *sprite);
+static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite);
+static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite);
 static void sub_81413DC(u8 taskId);
 static void sub_814146C(u8 taskId);
 static void sub_81414BC(u8 taskId);
@@ -338,7 +338,7 @@ void sub_813F844(u8 taskId)
         y = GetBattlerSpriteCoord(gAnimBankAttacker, 1);
         priority = gSprites[spriteId].oam.priority;
         subpriority = gSprites[spriteId].subpriority;
-        gTasks[taskId].data[10] = sub_814086C(x, y + 32, priority, subpriority, ballIndex);
+        gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballIndex);
         selectedPalettes = sub_80791A8(1, 0, 0, 0, 0, 0, 0);
         gTasks[taskId].data[11] = sub_8141314(0, gAnimBankAttacker, selectedPalettes, ballIndex);
         gTasks[taskId].data[0]++;
@@ -353,14 +353,14 @@ void sub_813F844(u8 taskId)
 void sub_813F990(u8 taskId)
 {
     u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem);
-    sub_80478DC(ballIndex);
+    LoadBallGraphics(ballIndex);
     DestroyAnimVisualTask(taskId);
 }
 
 void sub_813F9B8(u8 taskId)
 {
     u8 ballIndex = ball_number_to_ball_processing_index(gLastUsedItem);
-    sub_804794C(ballIndex);
+    FreeBallGraphics(ballIndex);
     DestroyAnimVisualTask(taskId);
 }
 
@@ -526,7 +526,7 @@ static void sub_813FDC0(struct Sprite *sprite)
             if (ballIndex2 < 0)
                 return;
 
-            sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
+            AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
             sub_8141314(0, gAnimBankTarget, 14, ballIndex);
         }
     }
@@ -946,7 +946,7 @@ static void sub_81405F4(struct Sprite *sprite)
     if (ballIndex2 < 0)
         goto LABEL;
 
-    sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
+    AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
     sub_8141314(1, gAnimBankTarget, 14, ballIndex);
 
     LABEL:
@@ -1090,17 +1090,17 @@ _08140868: .4byte gDoingBattleAnim\n\
 }
 #endif // NONMATCHING
 
-u8 sub_814086C(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex)
+u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex)
 {
     u8 taskId;
 
-    if (GetSpriteTileStartByTag(gUnknown_0840B258[ballIndex].tag) == 0xFFFF)
+    if (GetSpriteTileStartByTag(gBallOpenParticleSpritesheets[ballIndex].tag) == 0xFFFF)
     {
-        LoadCompressedObjectPic(&gUnknown_0840B258[ballIndex]);
-        LoadCompressedObjectPalette(&gUnknown_0840B2B8[ballIndex]);
+        LoadCompressedObjectPic(&gBallOpenParticleSpritesheets[ballIndex]);
+        LoadCompressedObjectPalette(&gBallOpenParticlePalettes[ballIndex]);
     }
 
-    taskId = CreateTask(gUnknown_0840B384[ballIndex], 5);
+    taskId = CreateTask(gBallOpenParticleAnimationFuncs[ballIndex], 5);
     gTasks[taskId].data[1] = x;
     gTasks[taskId].data[2] = y;
     gTasks[taskId].data[3] = priority;
@@ -1113,7 +1113,7 @@ u8 sub_814086C(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballIndex)
     return taskId;
 }
 
-void sub_8140930(u8 taskId)
+void PokeBallOpenParticleAnimation(u8 taskId)
 {
     u8 spriteId;
     u8 x, y;
@@ -1129,9 +1129,9 @@ void sub_8140930(u8 taskId)
         priority = gTasks[taskId].data[3];
         subpriority = gTasks[taskId].data[4];
 
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140A08;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1;
         gSprites[spriteId].oam.priority = priority;
 
         var0 = (u8)gTasks[taskId].data[0];
@@ -1150,24 +1150,24 @@ void sub_8140930(u8 taskId)
     gTasks[taskId].data[0]++;
 }
 
-static void sub_8140A08(struct Sprite *sprite)
+static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 {
     if (sprite->data[1] == 0)
-        sprite->callback = sub_8140A28;
+        sprite->callback = PokeBallOpenParticleAnimation_Step2;
     else
         sprite->data[1]--;
 }
 
-static void sub_8140A28(struct Sprite *sprite)
+static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite)
 {
     sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
     sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]);
     sprite->data[1] += 2;
     if (sprite->data[1] == 50)
-        sub_8141294(sprite);
+        DestroyBallOpenAnimationParticle(sprite);
 }
 
-void sub_8140A64(u8 taskId)
+void TimerBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1181,9 +1181,9 @@ void sub_8140A64(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140ECC;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 32;
         gSprites[spriteId].data[4] = 10;
@@ -1195,7 +1195,7 @@ void sub_8140A64(u8 taskId)
     DestroyTask(taskId);
 }
 
-void sub_8140B3C(u8 taskId)
+void DiveBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1209,9 +1209,9 @@ void sub_8140B3C(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140ECC;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 32;
         gSprites[spriteId].data[4] = 10;
@@ -1223,7 +1223,7 @@ void sub_8140B3C(u8 taskId)
     DestroyTask(taskId);
 }
 
-void sub_8140C14(u8 taskId)
+void SafariBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1237,9 +1237,9 @@ void sub_8140C14(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140ECC;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 32;
         gSprites[spriteId].data[4] = 4;
@@ -1251,7 +1251,7 @@ void sub_8140C14(u8 taskId)
     DestroyTask(taskId);
 }
 
-void sub_8140CE8(u8 taskId)
+void UltraBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1265,9 +1265,9 @@ void sub_8140CE8(u8 taskId)
 
     for (i = 0; i < 10; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140ECC;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 25;
         gSprites[spriteId].data[4] = 5;
@@ -1279,7 +1279,7 @@ void sub_8140CE8(u8 taskId)
     DestroyTask(taskId);
 }
 
-void sub_8140DC4(u8 taskId)
+void GreatBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1299,9 +1299,9 @@ void sub_8140DC4(u8 taskId)
 
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-            StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-            gSprites[spriteId].callback = sub_8140ECC;
+            spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+            gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
             gSprites[spriteId].data[4] = 8;
@@ -1318,7 +1318,7 @@ void sub_8140DC4(u8 taskId)
     }
 }
 
-static void sub_8140ECC(struct Sprite *sprite)
+static void FanOutBallOpenParticles_Step1(struct Sprite *sprite)
 {
     sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
     sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]);
@@ -1326,10 +1326,10 @@ static void sub_8140ECC(struct Sprite *sprite)
     sprite->data[1] += sprite->data[5];
     sprite->data[2] += sprite->data[6];
     if (++sprite->data[3] == 51)
-        sub_8141294(sprite);
+        DestroyBallOpenAnimationParticle(sprite);
 }
 
-void sub_8140F24(u8 taskId)
+void RepeatBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1343,9 +1343,9 @@ void sub_8140F24(u8 taskId)
 
     for (i = 0; i < 12; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8140FF8;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 21;
     }
@@ -1354,7 +1354,7 @@ void sub_8140F24(u8 taskId)
     DestroyTask(taskId);
 }
 
-static void sub_8140FF8(struct Sprite *sprite)
+static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 {
     sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
     sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2]));
@@ -1362,10 +1362,10 @@ static void sub_8140FF8(struct Sprite *sprite)
     sprite->data[1]++;
     sprite->data[2]++;
     if (++sprite->data[3] == 51)
-        sub_8141294(sprite);
+        DestroyBallOpenAnimationParticle(sprite);
 }
 
-void sub_8141058(u8 taskId)
+void MasterBallOpenParticleAnimation(u8 taskId)
 {
     u8 i, j;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1381,9 +1381,9 @@ void sub_8141058(u8 taskId)
     {
         for (i = 0; i < 8; i++)
         {
-            spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-            StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-            gSprites[spriteId].callback = sub_8140ECC;
+            spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+            StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+            gSprites[spriteId].callback = FanOutBallOpenParticles_Step1;
             gSprites[spriteId].oam.priority = priority;
             gSprites[spriteId].data[0] = i * 32;
             gSprites[spriteId].data[4] = 8;
@@ -1405,7 +1405,7 @@ void sub_8141058(u8 taskId)
     DestroyTask(taskId);
 }
 
-void sub_8141164(u8 taskId)
+void PremierBallOpenParticleAnimation(u8 taskId)
 {
     u8 i;
     u8 x, y, priority, subpriority, ballIndex;
@@ -1419,9 +1419,9 @@ void sub_8141164(u8 taskId)
 
     for (i = 0; i < 8; i++)
     {
-        spriteId = CreateSprite(&gSpriteTemplate_840B3B4[ballIndex], x, y, subpriority);
-        StartSpriteAnim(&gSprites[spriteId], gUnknown_0840B378[ballIndex]);
-        gSprites[spriteId].callback = sub_8141230;
+        spriteId = CreateSprite(&gSpriteTemplates_840B3B4[ballIndex], x, y, subpriority);
+        StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballIndex]);
+        gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1;
         gSprites[spriteId].oam.priority = priority;
         gSprites[spriteId].data[0] = i * 32;
     }
@@ -1430,7 +1430,7 @@ void sub_8141164(u8 taskId)
     DestroyTask(taskId);
 }
 
-static void sub_8141230(struct Sprite *sprite)
+static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 {
     sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
     sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2]));
@@ -1438,10 +1438,10 @@ static void sub_8141230(struct Sprite *sprite)
     sprite->data[1]++;
     sprite->data[2]++;
     if (++sprite->data[3] == 51)
-        sub_8141294(sprite);
+        DestroyBallOpenAnimationParticle(sprite);
 }
 
-static void sub_8141294(struct Sprite *sprite)
+static void DestroyBallOpenAnimationParticle(struct Sprite *sprite)
 {
     int i;
     int temp;
@@ -1460,8 +1460,8 @@ static void sub_8141294(struct Sprite *sprite)
         {
             for (i = 0; i < 12; i++)
             {
-                FreeSpriteTilesByTag(gUnknown_0840B258[i].tag);
-                FreeSpritePaletteByTag(gUnknown_0840B2B8[i].tag);
+                FreeSpriteTilesByTag(gBallOpenParticleSpritesheets[i].tag);
+                FreeSpritePaletteByTag(gBallOpenParticlePalettes[i].tag);
             }
 
             DestroySprite(sprite);
diff --git a/src/battle/battle_bg.c b/src/battle/battle_bg.c
index 5a2a1efa3..4928708e0 100644
--- a/src/battle/battle_bg.c
+++ b/src/battle/battle_bg.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "battle.h"
-#include "constants/songs.h"
 #include "decompress.h"
 #include "ewram.h"
 #include "graphics.h"
@@ -13,6 +12,8 @@
 #include "trainer.h"
 #include "trig.h"
 #include "sound.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 
 extern u16 gBattleTypeFlags;
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 8ca3d160a..f9c8fe7d1 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -62,7 +62,7 @@ extern void sub_8037A74(void);
 extern void sub_8032984(u8, u16);
 extern void sub_8037E30(void);
 extern void sub_80312F0(struct Sprite *);
-extern u8 sub_8046400();
+extern u8 StartSendOutMonAnimation();
 extern void sub_8032A08();
 extern void sub_8043DB0();
 extern void sub_8037BBC(void);
@@ -1195,7 +1195,7 @@ void sub_8039430(u8 a, u8 b)
     StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
     gSprites[gBankSpriteIds[a]].invisible = TRUE;
     gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE);
+    gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFE);
 }
 
 void LinkOpponentHandleReturnPokeToBall(void)
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index dff4edfc1..38514bfb5 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -79,7 +79,7 @@ extern void sub_80105EC(struct Sprite *);
 extern s32 sub_803FC34(u16);
 extern void LoadPlayerTrainerBankSprite();
 extern void sub_80313A0(struct Sprite *);
-extern u8 sub_8046400();
+extern u8 StartSendOutMonAnimation();
 extern void sub_80312F0(struct Sprite *);
 extern u8 CreateInvisibleSpriteWithCallback();
 extern void BattleLoadPlayerMonSprite();
@@ -1143,7 +1143,7 @@ void sub_811F864(u8 a, u8 b)
     StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
     gSprites[gBankSpriteIds[a]].invisible = TRUE;
     gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFF);
+    gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFF);
 }
 
 void LinkPartnerHandleReturnPokeToBall(void)
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index ee313c098..a7e99900b 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -74,7 +74,7 @@ extern u8 GetBattlerPosition(u8);
 extern void sub_8032984(u8, u16);
 extern void sub_80333D4(void);
 extern void sub_80312F0(struct Sprite *);
-extern u8 sub_8046400();
+extern u8 StartSendOutMonAnimation();
 extern void sub_8032A08();
 extern void sub_8043DB0();
 extern void sub_8033160(void);
@@ -1168,7 +1168,7 @@ void sub_803495C(u8 a, u8 b)
     StartSpriteAnim(&gSprites[gBankSpriteIds[a]], gBattleMonForms[a]);
     gSprites[gBankSpriteIds[a]].invisible = TRUE;
     gSprites[gBankSpriteIds[a]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_0300434C[a]].data[0] = sub_8046400(0, 0xFE);
+    gSprites[gUnknown_0300434C[a]].data[0] = StartSendOutMonAnimation(0, 0xFE);
 }
 
 void OpponentHandleReturnPokeToBall(void)
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 654a2c195..de8b1579b 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -126,7 +126,7 @@ extern void sub_802DEAC(void);
 extern void sub_80312F0(struct Sprite *);
 extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
-extern u8 sub_8046400();
+extern u8 StartSendOutMonAnimation();
 extern void sub_802D798(void);
 extern void bx_0802E404(void);
 extern u8 gActiveBattler;
@@ -2523,7 +2523,7 @@ void sub_802F934(u8 bank, u8 b)
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF);
+    gSprites[gUnknown_0300434C[bank]].data[0] = StartSendOutMonAnimation(0, 0xFF);
 }
 
 void PlayerHandleReturnPokeToBall(void)
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 312ef9d12..a7ce7d27d 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -88,7 +88,7 @@ extern void oamt_add_pos2_onto_pos1();
 extern void StartAnimLinearTranslation(struct Sprite *);
 extern void sub_8030E38(struct Sprite *);
 extern void StoreSpriteCallbackInData();
-extern u8 sub_8046400();
+extern u8 StartSendOutMonAnimation();
 extern u8 GetBattlerSpriteCoord();
 extern u8 sub_8077F68();
 extern u8 sub_8079E90();
@@ -1518,7 +1518,7 @@ void sub_81398BC(u8 bank)
     StartSpriteAnim(&gSprites[gBankSpriteIds[bank]], gBattleMonForms[bank]);
     gSprites[gBankSpriteIds[bank]].invisible = TRUE;
     gSprites[gBankSpriteIds[bank]].callback = SpriteCallbackDummy;
-    gSprites[gUnknown_0300434C[bank]].data[0] = sub_8046400(0, 0xFF);
+    gSprites[gUnknown_0300434C[bank]].data[0] = StartSendOutMonAnimation(0, 0xFF);
 }
 
 void sub_8139A2C(u8 taskId)
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 8c5f68902..fc929eb4d 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -12,9 +12,7 @@
 #include "fieldmap.h"
 #include "fldeff_poison.h"
 #include "main.h"
-#include "constants/maps.h"
 #include "metatile_behavior.h"
-#include "constants/opponents.h"
 #include "palette.h"
 #include "random.h"
 #include "overworld.h"
@@ -22,15 +20,18 @@
 #include "script.h"
 #include "script_pokemon_80C4.h"
 #include "secret_base.h"
-#include "constants/songs.h"
 #include "sound.h"
-#include "constants/species.h"
 #include "starter_choose.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "text.h"
 #include "trainer.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/opponents.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 extern u16 gSpecialVar_Result;
 
@@ -159,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
 const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
 {
     {
-        {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
+        {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5},
         MAP_GROUP(ROUTE118),
         MAP_NUM(ROUTE118),
     },
     {
-        {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
+        {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
+        {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5},
         MAP_GROUP(ROUTE109),
         MAP_NUM(ROUTE109),
     },
     {
-        {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
+        {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5},
         MAP_GROUP(ROUTE109),
         MAP_NUM(ROUTE109),
     },
     {
-        {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
+        {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5},
         MAP_GROUP(ROUTE124),
         MAP_NUM(ROUTE124),
     },
     {
-        {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
+        {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
+        {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5},
         MAP_GROUP(ROUTE111),
         MAP_NUM(ROUTE111),
     },
     {
-        {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
+        {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5},
         MAP_GROUP(MT_PYRE_6F),
         MAP_NUM(MT_PYRE_6F),
     },
     {
-        {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
+        {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
+        {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5},
         MAP_GROUP(ROUTE121),
         MAP_NUM(ROUTE121),
     },
     {
-        {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
+        {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
+        {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5},
         MAP_GROUP(ROUTE114),
         MAP_NUM(ROUTE114),
     },
     {
-        {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
+        {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5},
         MAP_GROUP(ROUTE107),
         MAP_NUM(ROUTE107),
     },
     {
-        {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
+        {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
+        {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5},
         MAP_GROUP(ROUTE118),
         MAP_NUM(ROUTE118),
     },
     {
-        {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
+        {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5},
         MAP_GROUP(ROUTE114),
         MAP_NUM(ROUTE114),
     },
     {
-        {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
+        {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5},
         MAP_GROUP(JAGGED_PASS),
         MAP_NUM(JAGGED_PASS),
     },
     {
-        {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
+        {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5},
         MAP_GROUP(METEOR_FALLS_1F_2R),
         MAP_NUM(METEOR_FALLS_1F_2R),
     },
     {
-        {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
+        {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5},
         MAP_GROUP(ROUTE120),
         MAP_NUM(ROUTE120),
     },
     {
-        {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
+        {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5},
         MAP_GROUP(ROUTE123),
         MAP_NUM(ROUTE123),
     },
     {
-        {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
+        {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5},
         MAP_GROUP(ROUTE123),
         MAP_NUM(ROUTE123),
     },
     {
-        {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
+        {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5},
         MAP_GROUP(ROUTE121),
         MAP_NUM(ROUTE121),
     },
     {
-        {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
+        {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5},
         MAP_GROUP(ROUTE116),
         MAP_NUM(ROUTE116),
     },
     {
-        {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
+        {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5},
         MAP_GROUP(ROUTE116),
         MAP_NUM(ROUTE116),
     },
     {
-        {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
+        {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
+        {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
+        {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5},
         MAP_GROUP(ROUTE103),
         MAP_NUM(ROUTE103),
     },
     {
-        {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
+        {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
+        {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5},
         MAP_GROUP(MT_CHIMNEY),
         MAP_NUM(MT_CHIMNEY),
     },
     {
-        {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
+        {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5},
         MAP_GROUP(ROUTE102),
         MAP_NUM(ROUTE102),
     },
     {
-        {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
+        {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5},
         MAP_GROUP(ROUTE106),
         MAP_NUM(ROUTE106),
     },
     {
-        {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
+        {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
+        {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
+        {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5},
         MAP_GROUP(ROUTE128),
         MAP_NUM(ROUTE128),
     },
     {
-        {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
+        {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5},
         MAP_GROUP(ROUTE128),
         MAP_NUM(ROUTE128),
     },
     {
-        {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
+        {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
+        {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
+        {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5},
         MAP_GROUP(METEOR_FALLS_1F_2R),
         MAP_NUM(METEOR_FALLS_1F_2R),
     },
     {
-        {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
+        {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5},
         MAP_GROUP(ROUTE120),
         MAP_NUM(ROUTE120),
     },
     {
-        {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
+        {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5},
         MAP_GROUP(ROUTE113),
         MAP_NUM(ROUTE113),
     },
     {
-        {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
+        {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5},
         MAP_GROUP(ROUTE115),
         MAP_NUM(ROUTE115),
     },
     {
-        {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
+        {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5},
         MAP_GROUP(ROUTE113),
         MAP_NUM(ROUTE113),
     },
     {
-        {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
+        {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5},
         MAP_GROUP(ROUTE124),
         MAP_NUM(ROUTE124),
     },
     {
-        {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
+        {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5},
         MAP_GROUP(JAGGED_PASS),
         MAP_NUM(JAGGED_PASS),
     },
     {
-        {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
+        {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6},
         MAP_GROUP(ROUTE103),
         MAP_NUM(ROUTE103),
     },
     {
-        {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
+        {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5},
         MAP_GROUP(ROUTE125),
         MAP_NUM(ROUTE125),
     },
     {
-        {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
+        {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5},
         MAP_GROUP(ROUTE110),
         MAP_NUM(ROUTE110),
     },
     {
-        {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
+        {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
+        {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5},
         MAP_GROUP(ROUTE117),
         MAP_NUM(ROUTE117),
     },
     {
-        {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
+        {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5},
         MAP_GROUP(ROUTE119),
         MAP_NUM(ROUTE119),
     },
     {
-        {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
+        {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5},
         MAP_GROUP(ROUTE119),
         MAP_NUM(ROUTE119),
     },
     {
-        {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
+        {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5},
         MAP_GROUP(ROUTE104),
         MAP_NUM(ROUTE104),
     },
     {
-        {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
+        {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5},
         MAP_GROUP(PETALBURG_WOODS),
         MAP_NUM(PETALBURG_WOODS),
     },
     {
-        {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
+        {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5},
         MAP_GROUP(ROUTE112),
         MAP_NUM(ROUTE112),
     },
     {
-        {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
+        {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5},
         MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F),
         MAP_NUM(ABANDONED_SHIP_ROOMS2_1F),
     },
     {
-        {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
+        {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE},
         MAP_GROUP(VICTORY_ROAD_1F),
         MAP_NUM(VICTORY_ROAD_1F),
     },
@@ -747,7 +748,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     u8 i;
     u8 sum;
     u32 count = numMons;
-    const void *party;
 
     if (gTrainers[opponentId].partySize < count)
         count = gTrainers[opponentId].partySize;
@@ -757,24 +757,36 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
     switch (gTrainers[opponentId].partyFlags)
     {
     case 0:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember0 *)party)[i].level;
+        {
+            const struct TrainerMonNoItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.NoItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 1:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember1 *)party)[i].level;
+    case F_TRAINER_PARTY_CUSTOM_MOVESET:
+        {
+            const struct TrainerMonNoItemCustomMoves *party;
+            party = gTrainers[opponentId].party.NoItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 2:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember2 *)party)[i].level;
+    case F_TRAINER_PARTY_HELD_ITEM:
+        {
+            const struct TrainerMonItemDefaultMoves *party;
+            party = gTrainers[opponentId].party.ItemDefaultMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
-    case 3:
-        party = gTrainers[opponentId].party;
-        for (i = 0; i < count; i++)
-            sum += ((struct TrainerPartyMember3 *)party)[i].level;
+    case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM:
+        {
+            const struct TrainerMonItemCustomMoves *party;
+            party = gTrainers[opponentId].party.ItemCustomMoves;
+            for (i = 0; i < count; i++)
+                sum += party[i].level;
+        }
         break;
     }
 
@@ -808,13 +820,13 @@ static u8 GetTrainerBattleTransition(void)
 
     if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR)
     {
-        if (gTrainerBattleOpponent == OPPONENT_SIDNEY)
+        if (gTrainerBattleOpponent == TRAINER_SIDNEY)
             return B_TRANSITION_SYDNEY;
-        if (gTrainerBattleOpponent == OPPONENT_PHOEBE)
+        if (gTrainerBattleOpponent == TRAINER_PHOEBE)
             return B_TRANSITION_PHOEBE;
-        if (gTrainerBattleOpponent == OPPONENT_GLACIA)
+        if (gTrainerBattleOpponent == TRAINER_GLACIA)
             return B_TRANSITION_GLACIA;
-        if (gTrainerBattleOpponent == OPPONENT_DRAKE)
+        if (gTrainerBattleOpponent == TRAINER_DRAKE)
             return B_TRANSITION_DRAKE;
         return B_TRANSITION_STEVEN;
     }
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index ac15246d6..abfdf2c3d 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -300,7 +300,7 @@ const struct SpriteTemplate gBallSpriteTemplates[] =
 extern void InitAnimArcTranslation();
 extern bool8 TranslateAnimArc(struct Sprite *);
 
-static void sub_8046464(u8);
+static void SendOutMonAnimation(u8);
 static void sub_80466E8(struct Sprite *);
 static void sub_80466F4(struct Sprite *);
 static void sub_8046760(struct Sprite *);
@@ -312,10 +312,10 @@ static void sub_8046C78(struct Sprite *);
 static void sub_8046E7C(struct Sprite *);
 static void sub_8046E9C(struct Sprite *);
 static void sub_8046FBC(struct Sprite *);
-static void sub_8047074(struct Sprite *);
-static void sub_80470C4(struct Sprite *);
-static void sub_8047230(struct Sprite *);
-static void sub_8047254(struct Sprite *);
+static void SendOutPlayerMonAnimation_Step0(struct Sprite *);
+static void SendOutPlayerMonAnimation_Step1(struct Sprite *);
+static void SendOutMonAnimation_Delay(struct Sprite *);
+static void SendOutOpponentMonAnimation_Step0(struct Sprite *);
 static void sub_80473D0(struct Sprite *);
 static void sub_804748C(struct Sprite *);
 static void sub_8047638(struct Sprite *);
@@ -324,28 +324,28 @@ static void sub_8047754(struct Sprite *);
 static void sub_804780C(struct Sprite *);
 static void sub_8047830(struct Sprite *);
 static void oamc_804BEB4(struct Sprite *);
-static u16 sub_8047978(u8);
+static u16 GetBattlerBall(u8);
 
-u8 sub_8046400(u16 a, u8 b)
+u8 StartSendOutMonAnimation(u16 a, u8 side)
 {
     u8 taskId;
 
     gDoingBattleAnim = 1;
     ewram17810[gActiveBattler].unk0_3 = 1;
-    taskId = CreateTask(sub_8046464, 5);
+    taskId = CreateTask(SendOutMonAnimation, 5);
     gTasks[taskId].data[1] = a;
-    gTasks[taskId].data[2] = b;
+    gTasks[taskId].data[2] = side;
     gTasks[taskId].data[3] = gActiveBattler;
     return 0;
 }
 
-static void sub_8046464(u8 taskId)
+static void SendOutMonAnimation(u8 taskId)
 {
-    bool8 sp0 = FALSE;
-    u16 r8;
-    u8 r5;
+    bool8 debug = FALSE;
+    u16 side;
+    u8 battler;
     u16 ball;
-    u8 r4;
+    u8 ballIndex;
     u8 spriteId;
 
     if (gTasks[taskId].data[0] == 0)
@@ -353,44 +353,49 @@ static void sub_8046464(u8 taskId)
         gTasks[taskId].data[0]++;
         return;
     }
-    r8 = gTasks[taskId].data[2];
-    r5 = gTasks[taskId].data[3];
-    if (GetBattlerSide(r5) != 0)
-        ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
+
+    side = gTasks[taskId].data[2];
+    battler = gTasks[taskId].data[3];
+    if (GetBattlerSide(battler) != B_SIDE_PLAYER)
+        ball = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL);
     else
-        ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[r5]], MON_DATA_POKEBALL);
-    r4 = ball_number_to_ball_processing_index(ball);
-    sub_80478DC(r4);
-    spriteId = CreateSprite(&gBallSpriteTemplates[r4], 32, 80, 0x1D);
+        ball = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL);
+
+    ballIndex = ball_number_to_ball_processing_index(ball);
+    LoadBallGraphics(ballIndex);
+    spriteId = CreateSprite(&gBallSpriteTemplates[ballIndex], 32, 80, 29);
     gSprites[spriteId].data[0] = 0x80;
     gSprites[spriteId].data[1] = 0;
-    gSprites[spriteId].data[7] = r8;
-    switch (r8)
+    gSprites[spriteId].data[7] = side;
+
+    switch (side)
     {
-    case 0xFF:
-        gBankTarget = r5;
+    case 0xFF: // Player's side
+        gBankTarget = battler;
         gSprites[spriteId].pos1.x = 24;
         gSprites[spriteId].pos1.y = 68;
-        gSprites[spriteId].callback = sub_8047074;
+        gSprites[spriteId].callback = SendOutPlayerMonAnimation_Step0;
         break;
-    case 0xFE:
-        gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(r5, 0);
-        gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(r5, 1) + 24;
-        gBankTarget = r5;
+    case 0xFE: // Opponent's side
+        gSprites[spriteId].pos1.x = GetBattlerSpriteCoord(battler, 0);
+        gSprites[spriteId].pos1.y = GetBattlerSpriteCoord(battler, 1) + 24;
+        gBankTarget = battler;
         gSprites[spriteId].data[0] = 0;
-        gSprites[spriteId].callback = sub_8047254;
+        gSprites[spriteId].callback = SendOutOpponentMonAnimation_Step0;
         break;
     default:
         gBankTarget = GetBattlerAtPosition(1);
-        sp0 = TRUE;
+        debug = TRUE;
         break;
     }
+
     gSprites[spriteId].data[6] = gBankTarget;
-    if (!sp0)
+    if (!debug)
     {
         DestroyTask(taskId);
         return;
     }
+
     gSprites[spriteId].data[0] = 0x22;
     gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBankTarget, 0);
     gSprites[spriteId].data[4] = GetBattlerSpriteCoord(gBankTarget, 1) - 16;
@@ -418,8 +423,8 @@ static void objc_0804ABD4(struct Sprite *sprite)
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->data[5] = 0;
-        r4 = ball_number_to_ball_processing_index(sub_8047978(r5));
-        sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4);
+        r4 = ball_number_to_ball_processing_index(GetBattlerBall(r5));
+        AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4);
         sprite->data[0] = sub_8141314(0, r5, 14, r4);
         sprite->data[6] = r5;
         sprite->data[7] = r8;
@@ -693,34 +698,35 @@ static void sub_8046AD0(u8 taskId)
 
 static void sub_8046C78(struct Sprite *sprite)
 {
-    u8 r5 = sprite->data[6];
-    u32 r4;  // not sure of this type
+    int ballIndex;
+    u8 battler = sprite->data[6];
 
     StartSpriteAnim(sprite, 1);
-    r4 = ball_number_to_ball_processing_index(sub_8047978(r5));
-    sub_814086C(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, r4);
-    sprite->data[0] = sub_8141314(1, sprite->data[6], 14, r4);
+    ballIndex = ball_number_to_ball_processing_index(GetBattlerBall(battler));
+    AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballIndex);
+    sprite->data[0] = sub_8141314(1, sprite->data[6], 14, ballIndex);
     sprite->callback = sub_8046E9C;
     if (gMain.inBattle)
     {
-        struct Pokemon *pkmn;
+        struct Pokemon *mon;
         u16 species;
-        s8 r8;
-        u16 r4_2;
+        s8 cryPanning;
+        u16 cryBehavior;
         u8 taskId;
 
-        if (GetBattlerSide(r5) != 0)
+        if (GetBattlerSide(battler) != 0)
         {
-            pkmn = &gEnemyParty[gBattlerPartyIndexes[r5]];
-            r8 = 25;
+            mon = &gEnemyParty[gBattlerPartyIndexes[battler]];
+            cryPanning = 25;
         }
         else
         {
-            pkmn = &gPlayerParty[gBattlerPartyIndexes[r5]];
-            r8 = -25;
+            mon = &gPlayerParty[gBattlerPartyIndexes[battler]];
+            cryPanning = -25;
         }
-        species = GetMonData(pkmn, MON_DATA_SPECIES);
-        if ((r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1))
+
+        species = GetMonData(mon, MON_DATA_SPECIES);
+        if ((battler == GetBattlerAtPosition(0) || battler == GetBattlerAtPosition(1))
          && IsDoubleBattle() && ewram17840.unk9_0)
         {
             if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
@@ -733,18 +739,21 @@ static void sub_8046C78(struct Sprite *sprite)
                 m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 128);
             }
         }
+
         if (!IsDoubleBattle() || !ewram17840.unk9_0)
-            r4_2 = 0;
-        else if (r5 == GetBattlerAtPosition(0) || r5 == GetBattlerAtPosition(1))
-            r4_2 = 1;
+            cryBehavior = 0;
+        else if (battler == GetBattlerAtPosition(0) || battler == GetBattlerAtPosition(1))
+            cryBehavior = 1;
         else
-            r4_2 = 2;
+            cryBehavior = 2;
+
         taskId = CreateTask(sub_8046AD0, 3);
         gTasks[taskId].data[0] = species;
-        gTasks[taskId].data[1] = r8;
-        gTasks[taskId].data[2] = r4_2;
+        gTasks[taskId].data[1] = cryPanning;
+        gTasks[taskId].data[2] = cryBehavior;
         gTasks[taskId].data[15] = 0;
     }
+
     StartSpriteAffineAnim(&gSprites[gBankSpriteIds[sprite->data[6]]], 1);
     AnimateSprite(&gSprites[gBankSpriteIds[sprite->data[6]]]);
     gSprites[gBankSpriteIds[sprite->data[6]]].data[1] = 0x1000;
@@ -795,7 +804,7 @@ static void sub_8046E9C(struct Sprite *sprite)
         if (r3 == 4)
         {
             for (i = 0; i < 12; i++)
-                sub_804794C(i);
+                FreeBallGraphics(i);
         }
     }
 }
@@ -825,7 +834,7 @@ static void sub_8046FBC(struct Sprite *sprite)
     }
 }
 
-static void sub_8047074(struct Sprite *sprite)
+static void SendOutPlayerMonAnimation_Step0(struct Sprite *sprite)
 {
     sprite->data[0] = 25;
     sprite->data[2] = GetBattlerSpriteCoord(sprite->data[6], 2);
@@ -833,12 +842,12 @@ static void sub_8047074(struct Sprite *sprite)
     sprite->data[5] = -30;
     sprite->oam.affineParam = sprite->data[6];
     InitAnimArcTranslation(sprite);
-    sprite->callback = sub_80470C4;
+    sprite->callback = SendOutPlayerMonAnimation_Step1;
 }
 
 #define HIBYTE(x) (((x) >> 8) & 0xFF)
 
-static void sub_80470C4(struct Sprite *sprite)
+static void SendOutPlayerMonAnimation_Step1(struct Sprite *sprite)
 {
     u32 r6;
     u32 r7;
@@ -855,6 +864,7 @@ static void sub_80470C4(struct Sprite *sprite)
             sprite->data[2] = ((sprite->data[2] / 3) & ~1) | r7;
             StartSpriteAffineAnim(sprite, 4);
         }
+
         r4 = sprite->data[0];
         TranslateAnimLinear(sprite);
         sprite->data[7] += sprite->data[6] / 3;
@@ -864,6 +874,7 @@ static void sub_80470C4(struct Sprite *sprite)
             sprite->data[0] = r4;
         else
             sprite->data[0] = r4 - 1;
+
         if (HIBYTE(sprite->data[7]) >= 80)
         {
             r6 = sprite->data[1] & 1;
@@ -882,17 +893,17 @@ static void sub_80470C4(struct Sprite *sprite)
             sprite->pos2.x = 0;
             sprite->data[6] = sprite->oam.affineParam & 0xFF;
             sprite->data[0] = 0;
-            if (IsDoubleBattle() && ewram17840.unk9_0
-             && sprite->data[6] == GetBattlerAtPosition(2))
-                sprite->callback = sub_8047230;
+            if (IsDoubleBattle() && ewram17840.unk9_0 && sprite->data[6] == GetBattlerAtPosition(2))
+                sprite->callback = SendOutMonAnimation_Delay;
             else
                 sprite->callback = sub_8046C78;
+
             StartSpriteAffineAnim(sprite, 0);
         }
     }
 }
 
-static void sub_8047230(struct Sprite *sprite)
+static void SendOutMonAnimation_Delay(struct Sprite *sprite)
 {
     if (sprite->data[0]++ > 24)
     {
@@ -901,15 +912,14 @@ static void sub_8047230(struct Sprite *sprite)
     }
 }
 
-static void sub_8047254(struct Sprite *sprite)
+static void SendOutOpponentMonAnimation_Step0(struct Sprite *sprite)
 {
     sprite->data[0]++;
     if (sprite->data[0] > 15)
     {
         sprite->data[0] = 0;
-        if (IsDoubleBattle() && ewram17840.unk9_0
-         && sprite->data[6] == GetBattlerAtPosition(3))
-            sprite->callback = sub_8047230;
+        if (IsDoubleBattle() && ewram17840.unk9_0 && sprite->data[6] == GetBattlerAtPosition(3))
+            sprite->callback = SendOutMonAnimation_Delay;
         else
             sprite->callback = sub_8046C78;
     }
@@ -917,7 +927,7 @@ static void sub_8047254(struct Sprite *sprite)
 
 static u8 sub_80472B0(u8 a, u8 b, u8 c, u8 d)
 {
-    return sub_814086C(a, b, c, d, 0);
+    return AnimateBallOpenParticles(a, b, c, d, 0);
 }
 
 static u8 sub_80472D8(u8 a, u8 b, u32 c)
@@ -1155,38 +1165,39 @@ static void oamc_804BEB4(struct Sprite *sprite)
     }
 }
 
-void sub_80478DC(u8 a)
+void LoadBallGraphics(u8 ballIndex)
 {
-    u16 var;
+    u16 tileStart;
 
-    if (GetSpriteTileStartByTag(sBallSpriteSheets[a].tag) == 0xFFFF)
+    if (GetSpriteTileStartByTag(sBallSpriteSheets[ballIndex].tag) == 0xFFFF)
     {
-        LoadCompressedObjectPic(&sBallSpriteSheets[a]);
-        LoadCompressedObjectPalette(&sBallSpritePalettes[a]);
+        LoadCompressedObjectPic(&sBallSpriteSheets[ballIndex]);
+        LoadCompressedObjectPalette(&sBallSpritePalettes[ballIndex]);
     }
-    switch (a)
+
+    switch (ballIndex)
     {
     case 6:
     case 10:
     case 11:
         break;
     default:
-        var = GetSpriteTileStartByTag(sBallSpriteSheets[a].tag);
-        LZDecompressVram(gUnknown_08D030D0, (void *)(VRAM + 0x10100 + var * 32));
+        tileStart = GetSpriteTileStartByTag(sBallSpriteSheets[ballIndex].tag);
+        LZDecompressVram(gUnknown_08D030D0, (void *)(VRAM + 0x10100 + tileStart * 32));
         break;
     }
 }
 
-void sub_804794C(u8 a)
+void FreeBallGraphics(u8 ballIndex)
 {
-    FreeSpriteTilesByTag(sBallSpriteSheets[a].tag);
-    FreeSpritePaletteByTag(sBallSpritePalettes[a].tag);
+    FreeSpriteTilesByTag(sBallSpriteSheets[ballIndex].tag);
+    FreeSpritePaletteByTag(sBallSpritePalettes[ballIndex].tag);
 }
 
-static u16 sub_8047978(u8 a)
+static u16 GetBattlerBall(u8 battler)
 {
-    if (GetBattlerSide(a) == 0)
-        return GetMonData(&gPlayerParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
+    if (GetBattlerSide(battler) == B_SIDE_PLAYER)
+        return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL);
     else
-        return GetMonData(&gEnemyParty[gBattlerPartyIndexes[a]], MON_DATA_POKEBALL);
+        return GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_POKEBALL);
 }
diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c
index a44cf028b..d0fbbec85 100644
--- a/src/battle/post_battle_event_funcs.c
+++ b/src/battle/post_battle_event_funcs.c
@@ -6,6 +6,7 @@
 #include "pokemon.h"
 #include "overworld.h"
 #include "script_pokemon_80C4.h"
+#include "constants/heal_locations.h"
 
 extern u8 gUnknown_02039324;
 
@@ -32,9 +33,9 @@ int GameClear(void)
     SetSecretBase2Field_9();
 
     if (gSaveBlock2.playerGender == MALE)
-        sub_80537CC(1);
+        sub_80537CC(HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F);
     else
-        sub_80537CC(2);
+        sub_80537CC(HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F);
 
     ribbonGet = FALSE;
 
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 4de8eba1f..7adfc6f7c 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -380,7 +380,9 @@ bool8 ShouldBattleEReaderTrainer(u8 levelType, u16 winStreak)
     return (numValid == 3);
 }
 
-bool8 sub_81346F4(void)
+// Tries to choose an E-Reader or record-mixing trainer for the next Battle
+// Tower trainer opponent.
+bool8 ChooseSpecialBattleTowerTrainer(void)
 {
     s32 recordIndex, i;
     u8 battleTowerLevelType;
@@ -437,344 +439,78 @@ bool8 sub_81346F4(void)
     return retVal;
 }
 
-// void sub_81347F8(void)
-// {
-//     bool8 levelType = gSaveBlock2.battleTower.battleTowerLevelType;
-//     if (sub_81346F4())
-//     {
-//         SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId);
-//         gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId;
-//     }
-//     else
-//     {
-//         u16 var1;
-
-//         if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] > 7)
-//         {
-//             while (1)
-//             {
-//                 s32 i;
-//                 u32 temp = ((Random() & 0xFF) * 30) >> 8;
-//                 var1 = temp + 70;
-//                 for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && var1 != gSaveBlock2.battleTower.var_4C1[i]; i++) // TODO: [i + 1]???
-//                 { }
+// Chooses the next battle tower trainer id opponent. It keeps track of the
+// trainer who have already been battled in the current 7-battle challenge
+// to ensure no duplicates are fought.
+void ChooseNextBattleTowerTrainer(void)
+{
+    int i;
+    u16 trainerId;
+    bool8 levelType;
 
-//                 if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
-//                 {
-//                     break;
-//                 }
-//             }
-//         }
-//         else
-//         {
-//             if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7)
-//             {
-//                 while (1)
-//                 {
-//                     s32 i;
-//                     u32 temp = ((Random() & 0xFF) * 5);
-//                     u32 temp2 = (((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10) + 20);
-//                     var1 = temp / 128 + temp2;
-//                     for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // TODO: [i + 1]????
-//                     { }
-
-//                     if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
-//                     {
-//                         break;
-//                     }
-//                 }
-//             }
-//             else
-//             {
-//                 while (1)
-//                 {
-//                     s32 i;
-//                     u32 temp = ((Random() & 0xFF) * 320);
-//                     u32 temp2 = ((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10);
-//                     var1 = temp + temp2;
-//                     for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++)
-//                     { }
-
-//                     if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
-//                     {
-//                         break;
-//                     }
-//                 }
-//             }
-//         }
+    levelType = gSaveBlock2.battleTower.battleTowerLevelType;
+    if (ChooseSpecialBattleTowerTrainer())
+    {
+        SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId);
+        gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId;
+        return;
+    }
 
-//         gSaveBlock2.battleTower.battleTowerTrainerId = var1;
-//         SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId);
+    if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] <= 7)
+    {
+        if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7)
+        {
+            while (1)
+            {
+                trainerId = ((Random() & 0xFF) * 5) >> 7;
+                trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10 + 20;
+
+                // Ensure trainer wasn't previously fought in this challenge.
+                for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++);
+                if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
+                {
+                    gSaveBlock2.battleTower.battleTowerTrainerId = trainerId;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            while (1)
+            {
+                trainerId = (((Random() & 0xFF) * 5) >> 6);
+                trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10;
+
+                // Ensure trainer wasn't previously fought in this challenge.
+                for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++);
+                if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
+                {
+                    gSaveBlock2.battleTower.battleTowerTrainerId = trainerId;
+                    break;
+                }
+            }
+        }
+    }
+    else
+    {
+        while (1)
+        {
+            trainerId = (((Random() & 0xFF) * 30) >> 8) + 70;
 
-//         if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7)
-//         {
-//             gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId;
-//         }
-//     }
-// }
+            // Ensure trainer wasn't previously fought in this challenge.
+            for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++);
+            if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1)
+            {
+                gSaveBlock2.battleTower.battleTowerTrainerId = trainerId;
+                break;
+            }
+        }
+    }
 
-NAKED
-void sub_81347F8(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    ldr r5, _08134838 @ =gSaveBlock2\n\
-    ldr r1, _0813483C @ =0x00000554\n\
-    adds r0, r5, r1\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 31\n\
-    lsrs r6, r0, 31\n\
-    bl sub_81346F4\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    beq _08134848\n\
-    ldr r2, _08134840 @ =0x00000564\n\
-    adds r4, r5, r2\n\
-    ldrb r0, [r4]\n\
-    bl SetBattleTowerTrainerGfxId\n\
-    lsls r0, r6, 1\n\
-    movs r3, 0xAB\n\
-    lsls r3, 3\n\
-    adds r1, r5, r3\n\
-    adds r0, r1\n\
-    ldrh r0, [r0]\n\
-    adds r0, r5, r0\n\
-    ldr r1, _08134844 @ =0x00000569\n\
-    adds r0, r1\n\
-    ldrb r1, [r4]\n\
-    b _081349DC\n\
-    .align 2, 0\n\
-_08134838: .4byte gSaveBlock2\n\
-_0813483C: .4byte 0x00000554\n\
-_08134840: .4byte 0x00000564\n\
-_08134844: .4byte 0x00000569\n\
-_08134848:\n\
-    lsls r0, r6, 1\n\
-    ldr r2, _081348D8 @ =0x0000055c\n\
-    adds r1, r5, r2\n\
-    adds r1, r0, r1\n\
-    ldrh r1, [r1]\n\
-    adds r7, r0, 0\n\
-    cmp r1, 0x7\n\
-    bls _0813485A\n\
-    b _0813495C\n\
-_0813485A:\n\
-    movs r3, 0xAB\n\
-    lsls r3, 3\n\
-    adds r0, r5, r3\n\
-    adds r1, r7, r0\n\
-    ldrh r0, [r1]\n\
-    cmp r0, 0x7\n\
-    bne _081348E4\n\
-    adds r6, r5, 0\n\
-    mov r9, r7\n\
-    adds r5, r1, 0\n\
-    ldr r0, _081348DC @ =0x0000056a\n\
-    adds r0, r6\n\
-    mov r10, r0\n\
-    mov r8, r5\n\
-_08134876:\n\
-    bl Random\n\
-    movs r1, 0xFF\n\
-    ands r1, r0\n\
-    lsls r2, r1, 2\n\
-    adds r2, r1\n\
-    ldr r1, _081348D8 @ =0x0000055c\n\
-    adds r4, r6, r1\n\
-    mov r3, r9\n\
-    adds r0, r3, r4\n\
-    ldrh r1, [r0]\n\
-    subs r1, 0x1\n\
-    lsls r0, r1, 2\n\
-    adds r0, r1\n\
-    lsls r0, 1\n\
-    adds r0, 0x14\n\
-    lsrs r2, 7\n\
-    adds r2, r0\n\
-    lsls r2, 16\n\
-    lsrs r2, 16\n\
-    movs r1, 0\n\
-    ldrh r0, [r5]\n\
-    subs r0, 0x1\n\
-    cmp r1, r0\n\
-    bge _081348C8\n\
-    mov r3, r10\n\
-    ldrb r0, [r3]\n\
-    cmp r0, r2\n\
-    beq _081348C8\n\
-    subs r0, r4, 0x4\n\
-    adds r0, r7, r0\n\
-    ldrh r0, [r0]\n\
-    subs r3, r0, 0x1\n\
-    adds r4, 0xE\n\
-_081348BA:\n\
-    adds r1, 0x1\n\
-    cmp r1, r3\n\
-    bge _081348C8\n\
-    adds r0, r1, r4\n\
-    ldrb r0, [r0]\n\
-    cmp r0, r2\n\
-    bne _081348BA\n\
-_081348C8:\n\
-    mov r3, r8\n\
-    ldrh r0, [r3]\n\
-    subs r0, 0x1\n\
-    ldr r4, _081348E0 @ =gSaveBlock2\n\
-    cmp r1, r0\n\
-    bne _08134876\n\
-    b _081349B6\n\
-    .align 2, 0\n\
-_081348D8: .4byte 0x0000055c\n\
-_081348DC: .4byte 0x0000056a\n\
-_081348E0: .4byte gSaveBlock2\n\
-_081348E4:\n\
-    adds r6, r5, 0\n\
-    mov r9, r7\n\
-    adds r5, r1, 0\n\
-    ldr r2, _08134950 @ =0x0000056a\n\
-    adds r2, r6\n\
-    mov r10, r2\n\
-    mov r8, r5\n\
-_081348F2:\n\
-    bl Random\n\
-    movs r1, 0xFF\n\
-    ands r1, r0\n\
-    lsls r0, r1, 2\n\
-    adds r0, r1\n\
-    lsrs r2, r0, 6\n\
-    ldr r3, _08134954 @ =0x0000055c\n\
-    adds r4, r6, r3\n\
-    mov r1, r9\n\
-    adds r0, r1, r4\n\
-    ldrh r1, [r0]\n\
-    subs r1, 0x1\n\
-    lsls r0, r1, 2\n\
-    adds r0, r1\n\
-    lsls r0, 1\n\
-    adds r0, r2, r0\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    movs r1, 0\n\
-    ldrh r0, [r5]\n\
-    subs r0, 0x1\n\
-    cmp r1, r0\n\
-    bge _08134942\n\
-    mov r3, r10\n\
-    ldrb r0, [r3]\n\
-    cmp r0, r2\n\
-    beq _08134942\n\
-    subs r0, r4, 0x4\n\
-    adds r0, r7, r0\n\
-    ldrh r0, [r0]\n\
-    subs r3, r0, 0x1\n\
-    adds r4, 0xE\n\
-_08134934:\n\
-    adds r1, 0x1\n\
-    cmp r1, r3\n\
-    bge _08134942\n\
-    adds r0, r1, r4\n\
-    ldrb r0, [r0]\n\
-    cmp r0, r2\n\
-    bne _08134934\n\
-_08134942:\n\
-    mov r3, r8\n\
-    ldrh r0, [r3]\n\
-    subs r0, 0x1\n\
-    ldr r4, _08134958 @ =gSaveBlock2\n\
-    cmp r1, r0\n\
-    bne _081348F2\n\
-    b _081349B6\n\
-    .align 2, 0\n\
-_08134950: .4byte 0x0000056a\n\
-_08134954: .4byte 0x0000055c\n\
-_08134958: .4byte gSaveBlock2\n\
-_0813495C:\n\
-    movs r2, 0xAB\n\
-    lsls r2, 3\n\
-    adds r0, r5, r2\n\
-    adds r6, r7, r0\n\
-    ldr r3, _081349EC @ =0x0000056a\n\
-    adds r3, r5\n\
-    mov r8, r3\n\
-    adds r5, r6, 0\n\
-_0813496C:\n\
-    bl Random\n\
-    movs r1, 0xFF\n\
-    ands r1, r0\n\
-    lsls r0, r1, 4\n\
-    subs r0, r1\n\
-    lsls r0, 1\n\
-    asrs r0, 8\n\
-    adds r0, 0x46\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    movs r1, 0\n\
-    ldrh r0, [r6]\n\
-    subs r0, 0x1\n\
-    cmp r1, r0\n\
-    bge _081349AC\n\
-    mov r3, r8\n\
-    ldrb r0, [r3]\n\
-    ldr r4, _081349F0 @ =gSaveBlock2\n\
-    cmp r0, r2\n\
-    beq _081349AC\n\
-    ldrh r0, [r5]\n\
-    subs r3, r0, 0x1\n\
-    ldr r0, _081349EC @ =0x0000056a\n\
-    adds r4, r0\n\
-_0813499E:\n\
-    adds r1, 0x1\n\
-    cmp r1, r3\n\
-    bge _081349AC\n\
-    adds r0, r1, r4\n\
-    ldrb r0, [r0]\n\
-    cmp r0, r2\n\
-    bne _0813499E\n\
-_081349AC:\n\
-    ldrh r0, [r6]\n\
-    subs r0, 0x1\n\
-    ldr r4, _081349F0 @ =gSaveBlock2\n\
-    cmp r1, r0\n\
-    bne _0813496C\n\
-_081349B6:\n\
-    ldr r1, _081349F4 @ =0x00000564\n\
-    adds r0, r4, r1\n\
-    strb r2, [r0]\n\
-    ldr r2, _081349F4 @ =0x00000564\n\
-    adds r5, r4, r2\n\
-    ldrb r0, [r5]\n\
-    bl SetBattleTowerTrainerGfxId\n\
-    movs r3, 0xAB\n\
-    lsls r3, 3\n\
-    adds r0, r4, r3\n\
-    adds r1, r7, r0\n\
-    ldrh r0, [r1]\n\
-    cmp r0, 0x6\n\
-    bhi _081349DE\n\
-    adds r0, r4, r0\n\
-    ldr r1, _081349F8 @ =0x00000569\n\
-    adds r0, r1\n\
-    ldrb r1, [r5]\n\
-_081349DC:\n\
-    strb r1, [r0]\n\
-_081349DE:\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\
-    .align 2, 0\n\
-_081349EC: .4byte 0x0000056a\n\
-_081349F0: .4byte gSaveBlock2\n\
-_081349F4: .4byte 0x00000564\n\
-_081349F8: .4byte 0x00000569\n\
-.syntax divided\n");
+    SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId);
+    // Don't bother saving this trainer, since it's the last one in the challenge.
+    if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7)
+        gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId;
 }
 
 void SetBattleTowerTrainerGfxId(u8 trainerIndex)
diff --git a/src/berry.c b/src/berry.c
index 323cb39cf..6e7d4592c 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "constants/items.h"
 #include "berry.h"
 #include "field_control_avatar.h"
 #include "event_object_movement.h"
@@ -12,6 +11,8 @@
 #include "random.h"
 #include "task.h"
 #include "text.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/items.h"
 
 #ifdef ENGLISH
 #define NAME_CHERI_BERRY   _("CHERI")
diff --git a/src/bike.c b/src/bike.c
index 41090a375..bf61d2aed 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -7,8 +7,9 @@
 #include "global.fieldmap.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
-#include "constants/songs.h"
 #include "sound.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 extern bool8 gBikeCyclingChallenge;
 extern u8 gBikeCollisions;
diff --git a/src/contest_effect.c b/src/contest_effect.c
index a5615851f..17779a0c6 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -158,10 +158,8 @@ static void ContestEffect_StartlePrevMons(void)
     u8 a = shared192D0.contestant;
 
     if (shared192D0.turnOrder[a] != 0) {
-        int i;
-        int j = 0;
-
-        for (i = 0; i < 4; i++)
+        int i, j;
+        for (i = 0, j = 0; i < 4; i++)
             if (shared192D0.turnOrder[a] > shared192D0.turnOrder[i])
                 shared192D0.jamQueue[j++] = i;
         shared192D0.jamQueue[j] = 0xFF;
@@ -617,150 +615,40 @@ static void ContestEffect_QualityDependsOnTiming(void)
     sContestantStatus[shared192D0.contestant].appeal2 = appeal;
 }
 
-#ifdef NONMATCHING
-// Not even close, send help
-// Works well if it’s the same type as the one before.
 static void ContestEffect_BetterIfSameType(void)
 {
-    s8 r4;
-    s8 r2;
+    s8 turnOrder = shared192D0.turnOrder[shared192D0.contestant];
+    s8 i = turnOrder - 1, j;
+    u16 move;
 
-    for (r4 = shared192D0.turnOrder[shared192D0.contestant]; r4 > 0; r4--)
+    if (turnOrder == 0)
+        return;
+
+    while (1)
     {
-        for (r2 = 0; r2 < 4; r2++)
+        for (j = 0; j < 4; j++)
         {
-            if (shared192D0.turnOrder[r2] == r4 - 1)
+            if (shared192D0.turnOrder[j] == i)
                 break;
         }
-        if (!(sContestantStatus[r2].noMoreTurns || sContestantStatus[r2].nervous || sContestantStatus[r2].numTurnsSkipped))
+        if (sContestantStatus[j].noMoreTurns || sContestantStatus[j].nervous || sContestantStatus[j].numTurnsSkipped)
+        {
+            if (--i < 0)
+                return;
+        }
+        else
         {
-            u16 move = sContestantStatus[shared192D0.contestant].currMove;
-
-            if (gContestMoves[move].contestCategory == gContestMoves[sContestantStatus[r2].currMove].contestCategory)
-            {
-                sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
-                SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_SAME_TYPE_GOOD);
-            }
             break;
         }
     }
+
+    move = sContestantStatus[shared192D0.contestant].currMove;
+    if (gContestMoves[move].contestCategory == gContestMoves[sContestantStatus[j].currMove].contestCategory)
+    {
+        sContestantStatus[shared192D0.contestant].appeal2 += gContestEffects[gContestMoves[move].effect].appeal * 2;
+        SetContestantEffectStringID(shared192D0.contestant, CONTEST_STRING_SAME_TYPE_GOOD);
+    }
 }
-#else
-NAKED void ContestEffect_BetterIfSameType(void)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tldr r1, _080B8940 @ =gSharedMem + 0x192D0\n"
-                "\tldrb r0, [r1, 0x11]\n"
-                "\tadds r0, r1\n"
-                "\tmovs r2, 0\n"
-                "\tldrsb r2, [r0, r2]\n"
-                "\tsubs r0, r2, 0x1\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tmov r12, r1\n"
-                "\tcmp r2, 0\n"
-                "\tbeq _080B8994\n"
-                "\tldrb r5, [r1]\n"
-                "\tmov r6, r12\n"
-                "\tsubs r6, 0x70\n"
-                "_080B88EA:\n"
-                "\tmovs r2, 0\n"
-                "\tlsls r0, r4, 24\n"
-                "\tasrs r1, r0, 24\n"
-                "\tadds r4, r0, 0\n"
-                "\tcmp r5, r1\n"
-                "\tbeq _080B8910\n"
-                "\tldr r3, _080B8940 @ =gSharedMem + 0x192D0\n"
-                "_080B88F8:\n"
-                "\tlsls r0, r2, 24\n"
-                "\tmovs r2, 0x80\n"
-                "\tlsls r2, 17\n"
-                "\tadds r0, r2\n"
-                "\tlsrs r2, r0, 24\n"
-                "\tasrs r0, 24\n"
-                "\tcmp r0, 0x3\n"
-                "\tbgt _080B8910\n"
-                "\tadds r0, r3\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r0, r1\n"
-                "\tbne _080B88F8\n"
-                "_080B8910:\n"
-                "\tlsls r2, 24\n"
-                "\tasrs r1, r2, 24\n"
-                "\tlsls r0, r1, 3\n"
-                "\tsubs r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tadds r3, r0, r6\n"
-                "\tldrb r1, [r3, 0xB]\n"
-                "\tmovs r0, 0x80\n"
-                "\tands r0, r1\n"
-                "\tadds r7, r2, 0\n"
-                "\tcmp r0, 0\n"
-                "\tbne _080B8932\n"
-                "\tldrb r1, [r3, 0xC]\n"
-                "\tmovs r0, 0x7\n"
-                "\tands r0, r1\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _080B8944\n"
-                "_080B8932:\n"
-                "\tmovs r1, 0xFF\n"
-                "\tlsls r1, 24\n"
-                "\tadds r0, r4, r1\n"
-                "\tlsrs r4, r0, 24\n"
-                "\tcmp r0, 0\n"
-                "\tblt _080B8994\n"
-                "\tb _080B88EA\n"
-                "\t.align 2, 0\n"
-                "_080B8940: .4byte gSharedMem + 0x192D0\n"
-                "_080B8944:\n"
-                "\tmov r2, r12\n"
-                "\tldrb r1, [r2, 0x11]\n"
-                "\tlsls r0, r1, 3\n"
-                "\tsubs r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tmov r3, r12\n"
-                "\tsubs r3, 0x70\n"
-                "\tadds r5, r0, r3\n"
-                "\tldrh r0, [r5, 0x6]\n"
-                "\tldr r4, _080B899C @ =gContestMoves\n"
-                "\tlsls r0, 3\n"
-                "\tadds r6, r0, r4\n"
-                "\tldrb r2, [r6, 0x1]\n"
-                "\tlsls r2, 29\n"
-                "\tasrs r1, r7, 24\n"
-                "\tlsls r0, r1, 3\n"
-                "\tsubs r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tadds r0, r3\n"
-                "\tldrh r0, [r0, 0x6]\n"
-                "\tlsls r0, 3\n"
-                "\tadds r0, r4\n"
-                "\tldrb r0, [r0, 0x1]\n"
-                "\tlsls r0, 29\n"
-                "\tcmp r2, r0\n"
-                "\tbne _080B8994\n"
-                "\tldr r1, _080B89A0 @ =gContestEffects\n"
-                "\tldrb r0, [r6]\n"
-                "\tlsls r0, 2\n"
-                "\tadds r0, r1\n"
-                "\tldrb r0, [r0, 0x1]\n"
-                "\tlsls r0, 1\n"
-                "\tldrh r1, [r5, 0x2]\n"
-                "\tadds r0, r1\n"
-                "\tstrh r0, [r5, 0x2]\n"
-                "\tmov r2, r12\n"
-                "\tldrb r0, [r2, 0x11]\n"
-                "\tmovs r1, 0x1F\n"
-                "\tbl SetContestantEffectStringID\n"
-                "_080B8994:\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r0}\n"
-                "\tbx r0\n"
-                "\t.align 2, 0\n"
-                "_080B899C: .4byte gContestMoves\n"
-                "_080B89A0: .4byte gContestEffects");
-}
-#endif
 
 // Works well if different in type than the one before.
 static void ContestEffect_BetterIfDiffType(void)
@@ -1113,16 +1001,20 @@ static bool8 WasAtLeastOneOpponentJammed(void)
                 shared192D0.jam2 = 10;
                 SetContestantEffectStringID(contestant, CONTEST_STRING_LITTLE_DISTRACTED);
             }
-            else if ((shared192D0.jam2 -= sContestantStatus[contestant].jamReduction) <= 0)
-            {
-                shared192D0.jam2 = 0;
-                SetContestantEffectStringID(contestant, CONTEST_STRING_NOT_FAZED);
-            }
             else
             {
-                JamContestant(contestant, shared192D0.jam2);
-                SetStartledString(contestant, shared192D0.jam2);
-                jamBuffer[contestant] = shared192D0.jam2;
+                shared192D0.jam2 -= sContestantStatus[contestant].jamReduction;
+                if (shared192D0.jam2 <= 0)
+                {
+                    shared192D0.jam2 = 0;
+                    SetContestantEffectStringID(contestant, CONTEST_STRING_NOT_FAZED);
+                }
+                else
+                {
+                    JamContestant(contestant, shared192D0.jam2);
+                    SetStartledString(contestant, shared192D0.jam2);
+                    jamBuffer[contestant] = shared192D0.jam2;
+                }
             }
         }
     }
diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c
index b07319048..ae89df88e 100644
--- a/src/contest_painting_effects.c
+++ b/src/contest_painting_effects.c
@@ -3,6 +3,7 @@
 #include "contest_painting.h"
 
 extern u16 (*gUnknown_03005DEC)[][32];
+extern u8 gUnknown_083E7A50[][3];
 extern u8 gUnknown_03005E00;
 extern u8 gUnknown_03005DFC;
 extern u8 gUnknown_03005DF8;
@@ -26,8 +27,15 @@ void sub_80FCC18(u8);
 void sub_80FC92C(u8);
 void sub_80FC9E4(u8);
 void sub_80FD1C8(u16);
-u16 sub_80FD39C(u16*);
+u16 ConvertColorToGrayscale(u16*);
 u16 sub_80FD68C(u16*, u16*, u16*);
+u16 ConvertCoolColor(u16*, u8);
+u16 ConvertToBlackOrWhite(u16*);
+u16 sub_80FD50C(u16*, u16*);
+u16 InvertColor(u16*);
+u16 sub_80FD7AC(u16*, u16*, u16*);
+u16 sub_80FD568(u16*, u16*);
+u16 GetCoolColorFromPersonality(u8);
 
 void sub_80FC7A0(struct Unk03005E20* info)
 {
@@ -152,13 +160,594 @@ void sub_80FCAC4(void)
     for (i = 0; i < gUnknown_03005DF0; i++)
     {
         u16* var2 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
-        u16* pal = &var2[gUnknown_03005DE8];
-        for (j = 0; j < gUnknown_03005DF8; j++, pal++)
+        u16* color = &var2[gUnknown_03005DE8];
+        for (j = 0; j < gUnknown_03005DF8; j++, color++)
         {
-            if (!(0x8000 & *pal))
+            if (!(0x8000 & *color))
+            {
+                *color = ConvertColorToGrayscale(color);
+            }
+        }
+    }
+}
+
+void sub_80FCB5C(void)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF8; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04];
+        u16* palette = &var0[gUnknown_03005DE8 + i];
+        u16 color = *palette;
+        j = 1;
+        palette += gUnknown_03005E04;
+        while (j < gUnknown_03005DF0 - 1)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = sub_80FD68C(&color, palette, palette + gUnknown_03005E04);
+                color = *palette;
+            }
+
+            j++;
+            palette += gUnknown_03005E04;
+        }
+    }
+}
+
+void sub_80FCC18(u8 arg0)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF0; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
+        u16* color = &var0[gUnknown_03005DE8];
+        for (j = 0; j < gUnknown_03005DF8; j++, color++)
+        {
+            if (!(0x8000 & *color))
+            {
+                *color = ConvertCoolColor(color, arg0);
+            }
+        }
+    }
+}
+
+void sub_80FCCBC(void)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF0; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
+        u16* color = &var0[gUnknown_03005DE8];
+        for (j = 0; j < gUnknown_03005DF8; j++, color++)
+        {
+            if (!(0x8000 & *color))
+            {
+                *color = ConvertToBlackOrWhite(color);
+            }
+        }
+    }
+}
+ 
+void sub_80FCD54(void)
+{
+    u8 i, j;
+    u16 *palette;
+
+    for (i = 0; i < gUnknown_03005DF0; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
+        palette = &var0[gUnknown_03005DE8];
+        *palette = sub_80FD50C(palette, palette + 1);
+        for (j = 1, palette = palette + 1; j < gUnknown_03005DF8 - 1; j++, palette++)
+        {
+            *palette = sub_80FD50C(palette, palette + 1);
+            *palette = sub_80FD50C(palette, palette - 1);
+        }
+
+        *palette = sub_80FD50C(palette, palette - 1);
+    }
+
+    for (j = 0; j < gUnknown_03005DF8; j++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04];
+        palette = &var0[gUnknown_03005DE8 + j];
+        *palette = sub_80FD50C(palette, palette + gUnknown_03005E04);
+        for (i = 1, palette = palette + gUnknown_03005E04; i < gUnknown_03005DF0 - 1; i++, palette += gUnknown_03005E04)
+        {
+            *palette = sub_80FD50C(palette, palette + gUnknown_03005E04);
+            *palette = sub_80FD50C(palette, palette - gUnknown_03005E04);
+        }
+
+        *palette = sub_80FD50C(palette, palette - gUnknown_03005E04);
+    }
+}
+
+void sub_80FCEA4(void)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF0; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
+        u16* color = &var0[gUnknown_03005DE8];
+        for (j = 0; j < gUnknown_03005DF8; j++, color++)
+        {
+            if (!(0x8000 & *color))
+            {
+                *color = InvertColor(color);
+            }
+        }
+    }
+}
+
+void sub_80FCF3C(void)
+{
+    u8 i, j;
+    u16 *palette;
+    u16 color;
+
+    palette = (*gUnknown_03005DEC)[0];
+    for (i = 0; i < 64; i++)
+    {
+        for (j = 0; j < 64; j++, palette++)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = InvertColor(palette);
+            }
+        }
+    }
+
+    for (j = 0; j < 64; j++)
+    {
+        palette = &(*gUnknown_03005DEC)[0][j];
+        color = *palette;
+        *palette = 0x8000;
+        for (i = 1, palette += 64; i < 63; i++, palette += 64)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = sub_80FD7AC(&color, palette, palette + 64);
+                color = *palette;
+            }
+        }
+
+        *palette = 0x8000;
+        palette = &(*gUnknown_03005DEC)[0][j];
+        color = *palette;
+        *palette = 0x8000;
+        for (i = 1, palette += 64; i < 63; i++, palette += 64)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = sub_80FD7AC(&color, palette, palette + 64);
+                color = *palette;
+            }
+        }
+
+        *palette = 0x8000;
+    }
+
+    palette = (*gUnknown_03005DEC)[0];
+    for (i = 0; i < 64; i++)
+    {
+        for (j = 0; j < 64; j++, palette++)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = InvertColor(palette);
+            }
+        }
+    }
+}
+
+void sub_80FD06C(void)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF0; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04];
+        u16* palette = &var0[gUnknown_03005DE8];
+        u16 color = *palette;
+        for (j = 1, palette++; j < gUnknown_03005DF8 - 1; j++, palette++)
+        {
+            if (!(0x8000 & *palette))
+            {
+                *palette = sub_80FD568(&color, palette);
+                color = *palette;
+            }
+        }
+    }
+}
+
+void sub_80FD114(void)
+{
+    u8 i, j;
+    for (i = 0; i < gUnknown_03005DF8; i++)
+    {
+        u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04];
+        u16* palette = &var0[gUnknown_03005DE8 + i];
+        u16 color = *palette;
+        for (j = 1, palette += gUnknown_03005E04; j < gUnknown_03005DF0 - 1; j++, palette += gUnknown_03005E04)
+        {
+            if (!(0x8000 & *palette))
             {
-                *pal = sub_80FD39C(pal);
+                *palette = sub_80FD568(&color, palette);
+                color = *palette;
             }
         }
     }
 }
+
+NAKED
+void sub_80FD1C8(u16 arg0)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x20\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r10, r0\n\
+    mov r2, sp\n\
+    ldr r3, _080FD234 @ =gUnknown_083E7A50\n\
+    lsls r1, r0, 1\n\
+    add r1, r10\n\
+    adds r0, r1, r3\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2]\n\
+    adds r0, r3, 0x1\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0]\n\
+    strb r0, [r2, 0x1]\n\
+    mov r5, sp\n\
+    adds r0, r3, 0x2\n\
+    adds r1, r0\n\
+    ldrb r4, [r1]\n\
+    lsls r2, r4, 24\n\
+    lsrs r1, r2, 27\n\
+    movs r0, 0x7\n\
+    ands r1, r0\n\
+    strh r1, [r5, 0x2]\n\
+    lsrs r2, 25\n\
+    mov r9, r2\n\
+    movs r0, 0x3\n\
+    ands r2, r0\n\
+    mov r9, r2\n\
+    movs r5, 0x1\n\
+    ands r5, r4\n\
+    movs r4, 0x1\n\
+    mov r8, r4\n\
+    cmp r8, r1\n\
+    bcs _080FD27A\n\
+    mov r3, sp\n\
+_080FD21A:\n\
+    cmp r5, 0\n\
+    bne _080FD238\n\
+    mov r0, r8\n\
+    lsls r2, r0, 2\n\
+    mov r4, sp\n\
+    adds r1, r4, r2\n\
+    ldrb r0, [r3]\n\
+    mov r4, r8\n\
+    subs r0, r4\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r3, 0x1]\n\
+    add r0, r8\n\
+    b _080FD24A\n\
+    .align 2, 0\n\
+_080FD234: .4byte gUnknown_083E7A50\n\
+_080FD238:\n\
+    mov r0, r8\n\
+    lsls r2, r0, 2\n\
+    mov r4, sp\n\
+    adds r1, r4, r2\n\
+    ldrb r0, [r3]\n\
+    adds r0, 0x1\n\
+    strb r0, [r1]\n\
+    ldrb r0, [r3, 0x1]\n\
+    subs r0, 0x1\n\
+_080FD24A:\n\
+    strb r0, [r1, 0x1]\n\
+    add r2, sp\n\
+    ldrb r0, [r2]\n\
+    cmp r0, 0x3F\n\
+    bhi _080FD25A\n\
+    ldrb r0, [r2, 0x1]\n\
+    cmp r0, 0x3F\n\
+    bls _080FD262\n\
+_080FD25A:\n\
+    mov r0, r8\n\
+    subs r0, 0x1\n\
+    strh r0, [r3, 0x2]\n\
+    b _080FD27A\n\
+_080FD262:\n\
+    ldrh r0, [r3, 0x2]\n\
+    mov r1, r8\n\
+    subs r0, r1\n\
+    strh r0, [r2, 0x2]\n\
+    mov r0, r8\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    ldrh r0, [r3, 0x2]\n\
+    cmp r8, r0\n\
+    bcc _080FD21A\n\
+_080FD27A:\n\
+    movs r2, 0\n\
+    mov r8, r2\n\
+    mov r0, sp\n\
+    ldrh r0, [r0, 0x2]\n\
+    cmp r8, r0\n\
+    bcc _080FD288\n\
+    b _080FD38A\n\
+_080FD288:\n\
+    movs r3, 0x1F\n\
+_080FD28A:\n\
+    ldr r1, _080FD2E8 @ =gUnknown_03005DEC\n\
+    mov r4, r8\n\
+    lsls r0, r4, 2\n\
+    mov r2, sp\n\
+    adds r6, r2, r0\n\
+    ldrb r0, [r6, 0x1]\n\
+    lsls r0, 7\n\
+    ldr r1, [r1]\n\
+    adds r1, r0\n\
+    ldrb r0, [r6]\n\
+    lsls r0, 1\n\
+    adds r2, r1, r0\n\
+    ldrh r1, [r2]\n\
+    movs r4, 0x80\n\
+    lsls r4, 8\n\
+    adds r0, r4, 0\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080FD376\n\
+    movs r7, 0x1F\n\
+    ands r7, r1\n\
+    lsls r0, r1, 16\n\
+    lsrs r5, r0, 21\n\
+    ands r5, r3\n\
+    lsrs r4, r0, 26\n\
+    ands r4, r3\n\
+    mov r0, r9\n\
+    cmp r0, 0\n\
+    blt _080FD36C\n\
+    cmp r0, 0x1\n\
+    ble _080FD2EC\n\
+    cmp r0, 0x3\n\
+    bgt _080FD36C\n\
+    ldrh r0, [r6, 0x2]\n\
+    adds r1, r7, r0\n\
+    lsls r1, 16\n\
+    lsrs r7, r1, 16\n\
+    adds r1, r5, r0\n\
+    lsls r1, 16\n\
+    lsrs r5, r1, 16\n\
+    adds r0, r4, r0\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    cmp r7, 0x1F\n\
+    bls _080FD360\n\
+    movs r7, 0x1F\n\
+    b _080FD360\n\
+    .align 2, 0\n\
+_080FD2E8: .4byte gUnknown_03005DEC\n\
+_080FD2EC:\n\
+    mov r1, r10\n\
+    lsls r0, r1, 1\n\
+    add r0, r10\n\
+    ldr r1, _080FD320 @ =gUnknown_083E7A50\n\
+    adds r1, 0x2\n\
+    adds r0, r1\n\
+    ldrb r0, [r0]\n\
+    lsrs r0, 3\n\
+    movs r1, 0x7\n\
+    ands r0, r1\n\
+    movs r1, 0x3\n\
+    str r2, [sp, 0x18]\n\
+    str r3, [sp, 0x1C]\n\
+    bl __umodsi3\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    ldr r2, [sp, 0x18]\n\
+    ldr r3, [sp, 0x1C]\n\
+    cmp r0, 0x1\n\
+    beq _080FD33C\n\
+    cmp r0, 0x1\n\
+    bgt _080FD324\n\
+    cmp r0, 0\n\
+    beq _080FD32A\n\
+    b _080FD36C\n\
+    .align 2, 0\n\
+_080FD320: .4byte gUnknown_083E7A50\n\
+_080FD324:\n\
+    cmp r0, 0x2\n\
+    beq _080FD34E\n\
+    b _080FD36C\n\
+_080FD32A:\n\
+    ldrh r0, [r6, 0x2]\n\
+    cmp r7, r0\n\
+    bcc _080FD338\n\
+    subs r0, r7, r0\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    b _080FD36C\n\
+_080FD338:\n\
+    movs r7, 0\n\
+    b _080FD36C\n\
+_080FD33C:\n\
+    ldrh r0, [r6, 0x2]\n\
+    cmp r5, r0\n\
+    bcc _080FD34A\n\
+    subs r0, r5, r0\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    b _080FD36C\n\
+_080FD34A:\n\
+    movs r5, 0\n\
+    b _080FD36C\n\
+_080FD34E:\n\
+    ldrh r0, [r6, 0x2]\n\
+    cmp r4, r0\n\
+    bcc _080FD35C\n\
+    subs r0, r4, r0\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    b _080FD36C\n\
+_080FD35C:\n\
+    movs r4, 0\n\
+    b _080FD36C\n\
+_080FD360:\n\
+    cmp r5, 0x1F\n\
+    bls _080FD366\n\
+    movs r5, 0x1F\n\
+_080FD366:\n\
+    cmp r4, 0x1F\n\
+    bls _080FD36C\n\
+    movs r4, 0x1F\n\
+_080FD36C:\n\
+    lsls r0, r4, 10\n\
+    lsls r1, r5, 5\n\
+    orrs r0, r1\n\
+    orrs r7, r0\n\
+    strh r7, [r2]\n\
+_080FD376:\n\
+    mov r0, r8\n\
+    adds r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    mov r0, sp\n\
+    ldrh r0, [r0, 0x2]\n\
+    cmp r8, r0\n\
+    bcs _080FD38A\n\
+    b _080FD28A\n\
+_080FD38A:\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\
+    .syntax divided\n");
+}
+
+u16 ConvertColorToGrayscale(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    u16 average = (red + green + blue) / 3;
+    return RGB2(average, average, average);
+}
+
+// The dark colors are the colored edges of the Cool painting effect.
+// Everything else is white.
+u16 ConvertCoolColor(u16 *color, u8 personality)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    if (red < 17 && green < 17 && blue < 17)
+        return GetCoolColorFromPersonality(personality);
+    else
+        return RGB2(31, 31, 31);
+}
+
+// Based on the given value, which comes from the first 8 bits of
+// the mon's personality value, return a color.
+u16 GetCoolColorFromPersonality(u8 personality)
+{
+    u16 red = 0;
+    u16 green = 0;
+    u16 blue = 0;
+    u8 strength = (personality / 6) % 3;
+    u8 colorType = personality % 6;
+
+    switch (colorType)
+    {
+    case 0:
+        // Teal color
+        green = 21 - strength;
+        blue = green;
+        red = 0;
+        break;
+    case 1:
+        // Yellow color
+        blue = 0;
+        red = 21 - strength;
+        green = red;
+        break;
+    case 2:
+        // Purple color
+        blue = 21 - strength;
+        green = 0;
+        red = blue;
+        break;
+    case 3:
+        // Red color
+        blue = 0;
+        green = 0;
+        red = 23 - strength;
+        break;
+    case 4:
+        // Blue color
+        blue = 23 - strength;
+        green = 0;
+        red = 0;
+        break;
+    case 5:
+        // Green color
+        blue = 0;
+        green = 23 - strength;
+        red = 0;
+        break;
+    }
+
+    return RGB2(red, green, blue);
+}
+
+u16 ConvertToBlackOrWhite(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    if (red < 17 && green < 17 && blue < 17)
+        return RGB2(0, 0, 0);
+    else
+        return RGB2(31, 31, 31);
+}
+
+u16 sub_80FD50C(u16 *colorA, u16 *colorB)
+{
+    if (*colorA)
+    {
+        if (*colorA & 0x8000)
+            return 0x8000;
+        if (*colorB & 0x8000)
+            return RGB2(0, 0, 0);
+
+        return *colorA;
+    }
+
+    return RGB2(0, 0, 0);
+}
+
+u16 InvertColor(u16 *color)
+{
+    u16 red = *color & 0x1F;
+    u16 green = (*color >> 5) & 0x1F;
+    u16 blue = (*color >> 10) & 0x1F;
+    red = 31 - red;
+    green = 31 - green;
+    blue = 31 - blue;
+
+    return RGB2(red, green, blue);
+}
diff --git a/src/data/heal_locations.h b/src/data/heal_locations.h
new file mode 100644
index 000000000..f764981bf
--- /dev/null
+++ b/src/data/heal_locations.h
@@ -0,0 +1,25 @@
+static const struct HealLocation sHealLocations[] =
+{
+    {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2},
+    {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2},
+    {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17},
+    {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 19, 20},
+    {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 22, 6},
+    {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 16, 39},
+    {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 5, 7},
+    {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 24, 15},
+    {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 28, 17},
+    {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 43, 32},
+    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 27, 49},
+    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 5, 9},
+    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 14, 9},
+    {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 6, 17},
+    {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 2, 11},
+    {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 9, 7},
+    {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 14, 8},
+    {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 16, 4},
+    {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 8, 16},
+    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 18, 6},
+    {MAP_GROUP(BATTLE_TOWER_OUTSIDE), MAP_NUM(BATTLE_TOWER_OUTSIDE), 14, 9},
+    {MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR), 15, 20},
+};
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index ad6b052df..5bd2a0f99 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -1,4 +1,4 @@
-const struct TrainerPartyMember0 gTrainerParty_Archie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -11,7 +11,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -24,7 +24,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -47,7 +47,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -60,7 +60,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -68,7 +68,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -81,7 +81,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -89,7 +89,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -107,7 +107,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -115,7 +115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -123,7 +123,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -136,7 +136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -149,7 +149,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -162,7 +162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -175,7 +175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -188,7 +188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -196,7 +196,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -209,7 +209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -222,7 +222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -240,7 +240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -248,7 +248,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -261,7 +261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -269,7 +269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -287,7 +287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -300,7 +300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -313,7 +313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -321,7 +321,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -339,7 +339,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -347,7 +347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous1[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -360,7 +360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matt1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt1[] = {
     {
 	.iv = 50,
 	.level = 32,
@@ -378,7 +378,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matt2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt2[] = {
     {
 	.iv = 50,
 	.level = 20,
@@ -396,7 +396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -409,7 +409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -422,7 +422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Archie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie2[] = {
     {
 	.iv = 150,
 	.level = 41,
@@ -440,7 +440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Archie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie3[] = {
     {
 	.iv = 150,
 	.level = 24,
@@ -458,7 +458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Daisy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -466,7 +466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -479,7 +479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lily[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lily[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -492,7 +492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lily[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Violet[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -510,7 +510,7 @@ const struct TrainerPartyMember0 gTrainerParty_Violet[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -523,7 +523,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -541,7 +541,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -559,7 +559,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rose5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -577,7 +577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = {
     {
 	.iv = 50,
 	.level = 24,
@@ -586,7 +586,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Chip[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -607,7 +607,7 @@ const struct TrainerPartyMember1 gTrainerParty_Chip[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Foster[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = {
     {
 	.iv = 50,
 	.level = 26,
@@ -622,7 +622,7 @@ const struct TrainerPartyMember1 gTrainerParty_Foster[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = {
     {
 	.iv = 60,
 	.level = 27,
@@ -631,7 +631,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = {
     {
 	.iv = 70,
 	.level = 30,
@@ -640,7 +640,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = {
     {
 	.iv = 80,
 	.level = 33,
@@ -649,7 +649,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = {
     {
 	.iv = 90,
 	.level = 36,
@@ -658,7 +658,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = {
     {
 	.iv = 50,
 	.level = 19,
@@ -671,7 +671,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -684,7 +684,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = {
     {
 	.iv = 150,
 	.level = 30,
@@ -697,7 +697,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = {
     {
 	.iv = 200,
 	.level = 33,
@@ -710,7 +710,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = {
     {
 	.iv = 250,
 	.level = 36,
@@ -723,7 +723,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = {
     {
 	.iv = 250,
 	.level = 39,
@@ -738,7 +738,7 @@ const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -751,7 +751,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carmen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carmen[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -759,7 +759,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carmen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gwen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -767,7 +767,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gwen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -780,7 +780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -793,7 +793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -806,7 +806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lola5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -819,7 +819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -828,7 +828,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Simon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -841,7 +841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Simon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Charlie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -849,7 +849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Charlie[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -858,7 +858,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -867,7 +867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -876,7 +876,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -885,7 +885,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Randall[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randall[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -893,7 +893,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randall[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Parker[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Parker[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -901,7 +901,7 @@ const struct TrainerPartyMember0 gTrainerParty_Parker[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_George[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_George[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -909,7 +909,7 @@ const struct TrainerPartyMember0 gTrainerParty_George[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Berke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Berke[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -917,7 +917,7 @@ const struct TrainerPartyMember0 gTrainerParty_Berke[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Clyde[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Clyde[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -950,7 +950,7 @@ const struct TrainerPartyMember1 gTrainerParty_Clyde[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vincent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -968,7 +968,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vincent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Leroy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = {
     {
 	.iv = 100,
 	.level = 46,
@@ -981,7 +981,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leroy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -999,7 +999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edgar[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1007,7 +1007,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edgar[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Albert[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1020,7 +1020,7 @@ const struct TrainerPartyMember0 gTrainerParty_Albert[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Samuel[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1038,7 +1038,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samuel[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vito[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1061,7 +1061,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vito[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Owen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1079,7 +1079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Owen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -1097,7 +1097,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -1115,7 +1115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -1133,7 +1133,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = {
     {
 	.iv = 140,
 	.level = 35,
@@ -1151,7 +1151,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Warren[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -1169,7 +1169,7 @@ const struct TrainerPartyMember0 gTrainerParty_Warren[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mary[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mary[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1177,7 +1177,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mary[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lori[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lori[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1185,7 +1185,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lori[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jody[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -1193,7 +1193,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jody[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wendy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = {
     {
 	.iv = 100,
 	.level = 31,
@@ -1214,7 +1214,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wendy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elaine[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elaine[] = {
     {
 	.iv = 100,
 	.level = 45,
@@ -1227,7 +1227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elaine[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -1245,7 +1245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = {
     {
 	.iv = 100,
 	.level = 31,
@@ -1253,7 +1253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hope[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1261,7 +1261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hope[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shannon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = {
     {
 	.iv = 100,
 	.level = 44,
@@ -1269,7 +1269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shannon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Michelle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = {
     {
 	.iv = 100,
 	.level = 42,
@@ -1287,7 +1287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Michelle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Caroline[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1300,7 +1300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caroline[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Julie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = {
     {
 	.iv = 100,
 	.level = 43,
@@ -1313,7 +1313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Julie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -1331,7 +1331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -1349,7 +1349,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -1367,7 +1367,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = {
     {
 	.iv = 140,
 	.level = 34,
@@ -1385,7 +1385,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Patricia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = {
     {
 	.iv = 0,
 	.level = 42,
@@ -1393,7 +1393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Patricia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kindra[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -1406,7 +1406,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kindra[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tammy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1419,7 +1419,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tammy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -1427,7 +1427,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tasha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -1440,7 +1440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tasha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = {
     {
 	.iv = 10,
 	.level = 35,
@@ -1448,7 +1448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -1461,7 +1461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -1474,7 +1474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = {
     {
 	.iv = 40,
 	.level = 42,
@@ -1492,7 +1492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -1501,7 +1501,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous2[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -1509,7 +1509,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Brianna1[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -1524,7 +1524,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Cindy2[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -1533,7 +1533,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna2[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1542,7 +1542,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Anette[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Anette[] = {
     {
 	.iv = 100,
 	.level = 45,
@@ -1551,7 +1551,7 @@ const struct TrainerPartyMember2 gTrainerParty_Anette[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -1560,7 +1560,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -1569,7 +1569,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -1578,7 +1578,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -1588,7 +1588,7 @@ const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Melissa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1596,7 +1596,7 @@ const struct TrainerPartyMember0 gTrainerParty_Melissa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sheila[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1604,7 +1604,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sheila[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shirley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -1612,7 +1612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shirley[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1627,7 +1627,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Connie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = {
     {
 	.iv = 100,
 	.level = 40,
@@ -1640,7 +1640,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bridget[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1648,7 +1648,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bridget[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Olivia[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -1657,7 +1657,7 @@ const struct TrainerPartyMember1 gTrainerParty_Olivia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = {
     {
 	.iv = 100,
 	.level = 39,
@@ -1675,7 +1675,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = {
     {
 	.iv = 10,
 	.level = 33,
@@ -1690,7 +1690,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = {
     {
 	.iv = 20,
 	.level = 36,
@@ -1705,7 +1705,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = {
     {
 	.iv = 30,
 	.level = 39,
@@ -1720,7 +1720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = {
     {
 	.iv = 40,
 	.level = 42,
@@ -1735,7 +1735,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -1744,7 +1744,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous3[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -1752,7 +1752,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Garret[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -1761,7 +1761,7 @@ const struct TrainerPartyMember2 gTrainerParty_Garret[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1770,7 +1770,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -1779,7 +1779,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Winston4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -1788,7 +1788,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston4[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Winston5[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -1798,7 +1798,7 @@ const struct TrainerPartyMember3 gTrainerParty_Winston5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -1806,7 +1806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chris[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -1814,7 +1814,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chris[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mark[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -1822,7 +1822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mark[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kenn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kenn[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -1830,7 +1830,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kenn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -1838,7 +1838,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -1851,7 +1851,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -1864,7 +1864,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Steve5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -1877,7 +1877,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Luis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1885,7 +1885,7 @@ const struct TrainerPartyMember0 gTrainerParty_Luis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Austin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austin[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -1903,7 +1903,7 @@ const struct TrainerPartyMember0 gTrainerParty_Austin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Douglas[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1916,7 +1916,7 @@ const struct TrainerPartyMember0 gTrainerParty_Douglas[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Darrin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1924,7 +1924,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darrin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1932,7 +1932,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerome[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1945,7 +1945,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerome[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Matthew[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -1953,7 +1953,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matthew[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_David[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -1966,7 +1966,7 @@ const struct TrainerPartyMember0 gTrainerParty_David[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Spencer[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -1984,7 +1984,7 @@ const struct TrainerPartyMember0 gTrainerParty_Spencer[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Roland[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -1992,7 +1992,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roland[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cody[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2005,7 +2005,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cody[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Stan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2013,7 +2013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Stan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Barry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2021,7 +2021,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dean[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -2039,7 +2039,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dean[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rodney[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2052,7 +2052,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rodney[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Richard[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2060,7 +2060,7 @@ const struct TrainerPartyMember0 gTrainerParty_Richard[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Herman[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2073,7 +2073,7 @@ const struct TrainerPartyMember0 gTrainerParty_Herman[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous4[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -2081,7 +2081,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -2089,7 +2089,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Franklin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2102,7 +2102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Franklin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Danny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danny[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -2115,7 +2115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jack[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2128,7 +2128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jack[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dudley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -2146,7 +2146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dudley[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chad[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -2159,7 +2159,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chad[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = {
     {
 	.iv = 10,
 	.level = 30,
@@ -2167,7 +2167,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = {
     {
 	.iv = 20,
 	.level = 33,
@@ -2175,7 +2175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -2188,7 +2188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tony5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -2201,7 +2201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hideki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideki[] = {
     {
 	.iv = 100,
 	.level = 14,
@@ -2209,7 +2209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -2222,7 +2222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = {
     {
 	.iv = 100,
 	.level = 33,
@@ -2240,7 +2240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Koichi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = {
     {
 	.iv = 100,
 	.level = 26,
@@ -2253,7 +2253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koichi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = {
     {
 	.iv = 100,
 	.level = 20,
@@ -2261,7 +2261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = {
     {
 	.iv = 110,
 	.level = 27,
@@ -2269,7 +2269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -2282,7 +2282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nob4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = {
     {
 	.iv = 130,
 	.level = 31,
@@ -2300,7 +2300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Nob5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = {
     {
 	.iv = 140,
 	.level = 33,
@@ -2327,7 +2327,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nob5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Yuji[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = {
     {
 	.iv = 100,
 	.level = 26,
@@ -2340,7 +2340,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yuji[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -2348,7 +2348,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -2366,7 +2366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kirk[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kirk[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -2379,7 +2379,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kirk[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Scott[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Scott[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -2387,7 +2387,7 @@ const struct TrainerPartyMember0 gTrainerParty_Scott[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Harvey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey[] = {
     {
 	.iv = 100,
 	.level = 18,
@@ -2400,7 +2400,7 @@ const struct TrainerPartyMember0 gTrainerParty_Harvey[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shawn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = {
     {
 	.iv = 100,
 	.level = 17,
@@ -2418,7 +2418,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shawn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Randy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randy[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -2436,7 +2436,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -2454,7 +2454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = {
     {
 	.iv = 10,
 	.level = 25,
@@ -2472,7 +2472,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -2490,7 +2490,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -2508,7 +2508,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -2526,7 +2526,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cole[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = {
     {
 	.iv = 100,
 	.level = 22,
@@ -2544,7 +2544,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cole[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Flint[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -2552,7 +2552,7 @@ const struct TrainerPartyMember0 gTrainerParty_Flint[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Axle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = {
     {
 	.iv = 100,
 	.level = 23,
@@ -2565,7 +2565,7 @@ const struct TrainerPartyMember0 gTrainerParty_Axle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jake[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jake[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -2573,7 +2573,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jake[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andy[] = {
     {
 	.iv = 100,
 	.level = 23,
@@ -2586,7 +2586,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2599,7 +2599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -2612,7 +2612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -2625,7 +2625,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -2638,7 +2638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -2651,7 +2651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Drew[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -2660,7 +2660,7 @@ const struct TrainerPartyMember1 gTrainerParty_Drew[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Cliff[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Cliff[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -2681,7 +2681,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cliff[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Larry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -2694,7 +2694,7 @@ const struct TrainerPartyMember0 gTrainerParty_Larry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shane[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2707,7 +2707,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shane[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Justin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -2715,7 +2715,7 @@ const struct TrainerPartyMember0 gTrainerParty_Justin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -2728,7 +2728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jeff[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -2741,7 +2741,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jeff[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Travis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -2749,7 +2749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Travis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -2762,7 +2762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -2775,7 +2775,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -2793,7 +2793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -2811,7 +2811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -2819,7 +2819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Donald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = {
     {
 	.iv = 100,
 	.level = 25,
@@ -2837,7 +2837,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Taylor[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = {
     {
 	.iv = 100,
 	.level = 25,
@@ -2855,7 +2855,7 @@ const struct TrainerPartyMember0 gTrainerParty_Taylor[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon1[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -2873,7 +2873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Derek[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = {
     {
 	.iv = 100,
 	.level = 15,
@@ -2891,7 +2891,7 @@ const struct TrainerPartyMember0 gTrainerParty_Derek[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon2[] = {
     {
 	.iv = 10,
 	.level = 31,
@@ -2909,7 +2909,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon3[] = {
     {
 	.iv = 20,
 	.level = 34,
@@ -2927,7 +2927,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon4[] = {
     {
 	.iv = 30,
 	.level = 36,
@@ -2950,7 +2950,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Brandon5[] = {
     {
 	.iv = 40,
 	.level = 38,
@@ -2983,7 +2983,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Edward[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -2992,7 +2992,7 @@ const struct TrainerPartyMember1 gTrainerParty_Edward[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Preston[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = {
     {
 	.iv = 100,
 	.level = 37,
@@ -3000,7 +3000,7 @@ const struct TrainerPartyMember0 gTrainerParty_Preston[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Virgil[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3013,7 +3013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Virgil[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Fritz[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fritz[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -3031,7 +3031,7 @@ const struct TrainerPartyMember0 gTrainerParty_Fritz[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_William[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3044,7 +3044,7 @@ const struct TrainerPartyMember0 gTrainerParty_William[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Joshua[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = {
     {
 	.iv = 0,
 	.level = 41,
@@ -3057,7 +3057,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joshua[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3070,7 +3070,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3083,7 +3083,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -3096,7 +3096,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -3109,7 +3109,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = {
     {
 	.iv = 40,
 	.level = 43,
@@ -3122,7 +3122,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3131,7 +3131,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hannah[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3144,7 +3144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hannah[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Samantha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = {
     {
 	.iv = 100,
 	.level = 37,
@@ -3152,7 +3152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samantha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maura[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -3165,7 +3165,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maura[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kayla[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -3173,7 +3173,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kayla[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexis[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = {
     {
 	.iv = 0,
 	.level = 40,
@@ -3191,7 +3191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexis[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3204,7 +3204,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3217,7 +3217,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = {
     {
 	.iv = 20,
 	.level = 37,
@@ -3230,7 +3230,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = {
     {
 	.iv = 30,
 	.level = 40,
@@ -3243,7 +3243,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = {
     {
 	.iv = 40,
 	.level = 43,
@@ -3256,7 +3256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Walter1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -3264,7 +3264,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tucker[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = {
     {
 	.iv = 0,
 	.level = 44,
@@ -3277,7 +3277,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tucker[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Thomas[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -3285,7 +3285,7 @@ const struct TrainerPartyMember0 gTrainerParty_Thomas[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Walter2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = {
     {
 	.iv = 10,
 	.level = 34,
@@ -3293,7 +3293,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = {
     {
 	.iv = 20,
 	.level = 36,
@@ -3308,7 +3308,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = {
     {
 	.iv = 30,
 	.level = 39,
@@ -3323,7 +3323,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Walter5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = {
     {
 	.iv = 40,
 	.level = 41,
@@ -3344,7 +3344,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter5[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Sidney[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = {
     {
 	.iv = 250,
 	.level = 46,
@@ -3382,7 +3382,7 @@ const struct TrainerPartyMember3 gTrainerParty_Sidney[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = {
     {
 	.iv = 250,
 	.level = 48,
@@ -3420,7 +3420,7 @@ const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Glacia[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = {
     {
 	.iv = 250,
 	.level = 50,
@@ -3458,7 +3458,7 @@ const struct TrainerPartyMember3 gTrainerParty_Glacia[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Drake[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = {
     {
 	.iv = 250,
 	.level = 52,
@@ -3496,7 +3496,7 @@ const struct TrainerPartyMember3 gTrainerParty_Drake[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Roxanne[] = {
     {
 	.iv = 150,
 	.level = 14,
@@ -3511,7 +3511,7 @@ const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Brawly[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Brawly[] = {
     {
 	.iv = 150,
 	.level = 17,
@@ -3526,7 +3526,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brawly[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wattson[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wattson[] = {
     {
 	.iv = 200,
 	.level = 22,
@@ -3547,7 +3547,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wattson[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Flannery[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Flannery[] = {
     {
 	.iv = 200,
 	.level = 26,
@@ -3568,7 +3568,7 @@ const struct TrainerPartyMember1 gTrainerParty_Flannery[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Norman[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Norman[] = {
     {
 	.iv = 200,
 	.level = 28,
@@ -3589,7 +3589,7 @@ const struct TrainerPartyMember1 gTrainerParty_Norman[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Winona[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Winona[] = {
     {
 	.iv = 200,
 	.level = 31,
@@ -3616,7 +3616,7 @@ const struct TrainerPartyMember1 gTrainerParty_Winona[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza[] = {
     {
 	.iv = 250,
 	.level = 42,
@@ -3633,7 +3633,7 @@ const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wallace[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wallace[] = {
     {
 	.iv = 200,
 	.level = 40,
@@ -3666,7 +3666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wallace[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = {
     {
 	.iv = 10,
 	.level = 10,
@@ -3674,7 +3674,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ted[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = {
     {
 	.iv = 10,
 	.level = 17,
@@ -3682,7 +3682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ted[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Paul[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = {
     {
 	.iv = 10,
 	.level = 15,
@@ -3700,7 +3700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Paul[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = {
     {
 	.iv = 20,
 	.level = 26,
@@ -3713,7 +3713,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = {
     {
 	.iv = 30,
 	.level = 29,
@@ -3726,7 +3726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = {
     {
 	.iv = 40,
 	.level = 32,
@@ -3739,7 +3739,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = {
     {
 	.iv = 50,
 	.level = 34,
@@ -3757,7 +3757,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = {
     {
 	.iv = 10,
 	.level = 9,
@@ -3770,7 +3770,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Georgia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = {
     {
 	.iv = 10,
 	.level = 16,
@@ -3783,7 +3783,7 @@ const struct TrainerPartyMember0 gTrainerParty_Georgia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = {
     {
 	.iv = 20,
 	.level = 26,
@@ -3796,7 +3796,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = {
     {
 	.iv = 30,
 	.level = 29,
@@ -3809,7 +3809,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = {
     {
 	.iv = 40,
 	.level = 32,
@@ -3822,7 +3822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Karen5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = {
     {
 	.iv = 50,
 	.level = 35,
@@ -3835,7 +3835,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -3850,7 +3850,7 @@ const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3865,7 +3865,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -3880,7 +3880,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -3895,7 +3895,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -3910,7 +3910,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -3925,7 +3925,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Victor[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = {
     {
 	.iv = 25,
 	.level = 16,
@@ -3940,7 +3940,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victor[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -3949,7 +3949,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Colton[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -3994,7 +3994,7 @@ const struct TrainerPartyMember3 gTrainerParty_Colton[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -4003,7 +4003,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -4012,7 +4012,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -4021,7 +4021,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -4030,7 +4030,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Victoria[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = {
     {
 	.iv = 50,
 	.level = 17,
@@ -4039,7 +4039,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victoria[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -4048,7 +4048,7 @@ const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Marissa[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Marissa[] = {
     {
 	.iv = 100,
 	.level = 36,
@@ -4069,7 +4069,7 @@ const struct TrainerPartyMember2 gTrainerParty_Marissa[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -4084,7 +4084,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -4099,7 +4099,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -4114,7 +4114,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -4129,7 +4129,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -4144,7 +4144,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = {
     {
 	.iv = 200,
 	.level = 28,
@@ -4152,7 +4152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = {
     {
 	.iv = 210,
 	.level = 31,
@@ -4161,7 +4161,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = {
     {
 	.iv = 220,
 	.level = 34,
@@ -4170,7 +4170,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = {
     {
 	.iv = 230,
 	.level = 37,
@@ -4179,7 +4179,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = {
     {
 	.iv = 240,
 	.level = 40,
@@ -4188,7 +4188,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Vicky[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = {
     {
 	.iv = 200,
 	.level = 18,
@@ -4197,7 +4197,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vicky[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = {
     {
 	.iv = 200,
 	.level = 22,
@@ -4210,7 +4210,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = {
     {
 	.iv = 210,
 	.level = 30,
@@ -4223,7 +4223,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = {
     {
 	.iv = 220,
 	.level = 33,
@@ -4236,7 +4236,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = {
     {
 	.iv = 230,
 	.level = 36,
@@ -4249,7 +4249,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = {
     {
 	.iv = 240,
 	.level = 39,
@@ -4262,7 +4262,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4270,7 +4270,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Billy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = {
     {
 	.iv = 0,
 	.level = 6,
@@ -4283,7 +4283,7 @@ const struct TrainerPartyMember0 gTrainerParty_Billy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Josh[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = {
     {
 	.iv = 100,
 	.level = 10,
@@ -4304,7 +4304,7 @@ const struct TrainerPartyMember1 gTrainerParty_Josh[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tommy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = {
     {
 	.iv = 100,
 	.level = 11,
@@ -4312,7 +4312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tommy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Joey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -4325,7 +4325,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joey[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Ben[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -4334,7 +4334,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ben[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous5[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -4347,7 +4347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kevin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -4360,7 +4360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kevin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Neal[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Neal[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4373,7 +4373,7 @@ const struct TrainerPartyMember0 gTrainerParty_Neal[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dillon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -4381,7 +4381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dillon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -4389,7 +4389,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -4402,7 +4402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -4415,7 +4415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -4433,7 +4433,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eddie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -4446,7 +4446,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eddie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Allen[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4459,7 +4459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allen[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Timmy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4477,7 +4477,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timmy[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Steven[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = {
     {
 	.iv = 255,
 	.level = 57,
@@ -4522,7 +4522,7 @@ const struct TrainerPartyMember3 gTrainerParty_Steven[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andrew[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -4540,7 +4540,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrew[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ivan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = {
     {
 	.iv = 0,
 	.level = 6,
@@ -4558,7 +4558,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ivan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Claude[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -4581,7 +4581,7 @@ const struct TrainerPartyMember0 gTrainerParty_Claude[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -4599,7 +4599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ned[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4607,7 +4607,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ned[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dale[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -4630,7 +4630,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dale[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nolan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -4638,7 +4638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nolan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Barny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -4651,7 +4651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wade[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4659,7 +4659,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wade[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carter[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -4682,7 +4682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carter[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = {
     {
 	.iv = 10,
 	.level = 24,
@@ -4700,7 +4700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -4723,7 +4723,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -4746,7 +4746,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -4769,7 +4769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ronald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -4802,7 +4802,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ronald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jacob[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -4820,7 +4820,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacob[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anthony[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -4833,7 +4833,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anthony[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4841,7 +4841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4849,7 +4849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4857,7 +4857,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4865,7 +4865,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4873,7 +4873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -4881,7 +4881,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = {
     {
 	.iv = 80,
 	.level = 15,
@@ -4899,7 +4899,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4907,7 +4907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4915,7 +4915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4923,7 +4923,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4931,7 +4931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4939,7 +4939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4947,7 +4947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4955,7 +4955,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -4963,7 +4963,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -4971,7 +4971,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -4979,7 +4979,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = {
     {
 	.iv = 10,
 	.level = 28,
@@ -4987,7 +4987,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = {
     {
 	.iv = 20,
 	.level = 31,
@@ -4995,7 +4995,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = {
     {
 	.iv = 30,
 	.level = 34,
@@ -5003,7 +5003,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maria5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = {
     {
 	.iv = 40,
 	.level = 37,
@@ -5011,7 +5011,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Caleb[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caleb[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -5034,7 +5034,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caleb[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous6[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5042,7 +5042,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5050,7 +5050,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous7[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5058,7 +5058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chase[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5071,7 +5071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chase[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = {
     {
 	.iv = 10,
 	.level = 39,
@@ -5079,7 +5079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = {
     {
 	.iv = 20,
 	.level = 42,
@@ -5087,7 +5087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = {
     {
 	.iv = 30,
 	.level = 45,
@@ -5095,7 +5095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = {
     {
 	.iv = 40,
 	.level = 48,
@@ -5103,7 +5103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous8[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5121,7 +5121,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Connor[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connor[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5144,7 +5144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connor[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous9[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5152,7 +5152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5160,7 +5160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Allison[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5183,7 +5183,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allison[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = {
     {
 	.iv = 10,
 	.level = 39,
@@ -5191,7 +5191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = {
     {
 	.iv = 20,
 	.level = 42,
@@ -5199,7 +5199,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = {
     {
 	.iv = 30,
 	.level = 45,
@@ -5207,7 +5207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = {
     {
 	.iv = 40,
 	.level = 48,
@@ -5215,7 +5215,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = {
     {
 	.iv = 100,
 	.level = 38,
@@ -5228,7 +5228,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = {
     {
 	.iv = 110,
 	.level = 41,
@@ -5241,7 +5241,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = {
     {
 	.iv = 120,
 	.level = 44,
@@ -5254,7 +5254,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = {
     {
 	.iv = 130,
 	.level = 46,
@@ -5272,7 +5272,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = {
     }
 };
 
-const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = {
+const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = {
     {
 	.iv = 140,
 	.level = 49,
@@ -5293,7 +5293,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Aaron[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aaron[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -5301,7 +5301,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aaron[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Perry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5309,7 +5309,7 @@ const struct TrainerPartyMember0 gTrainerParty_Perry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hugh[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5317,7 +5317,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hugh[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Phil[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5335,7 +5335,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phil[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jared[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -5343,7 +5343,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jared[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous10[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -5366,7 +5366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tanner[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanner[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -5384,7 +5384,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanner[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Will[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Will[] = {
     {
 	.iv = 100,
 	.level = 28,
@@ -5402,7 +5402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Will[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Colin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -5415,7 +5415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Colin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -5423,7 +5423,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Benny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -5441,7 +5441,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Chester[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5454,7 +5454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chester[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = {
     {
 	.iv = 10,
 	.level = 32,
@@ -5467,7 +5467,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = {
     {
 	.iv = 20,
 	.level = 35,
@@ -5480,7 +5480,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = {
     {
 	.iv = 30,
 	.level = 38,
@@ -5493,7 +5493,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robert5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = {
     {
 	.iv = 40,
 	.level = 41,
@@ -5506,7 +5506,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alex[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -5529,7 +5529,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alex[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beck[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -5542,7 +5542,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beck[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Yasu[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5550,7 +5550,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yasu[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Takashi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5568,7 +5568,7 @@ const struct TrainerPartyMember0 gTrainerParty_Takashi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Makoto[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makoto[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -5576,7 +5576,7 @@ const struct TrainerPartyMember0 gTrainerParty_Makoto[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideo1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -5599,7 +5599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -5626,7 +5626,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lung[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -5639,7 +5639,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lung[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -5666,7 +5666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = {
     {
 	.iv = 20,
 	.level = 27,
@@ -5693,7 +5693,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lao4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = {
     {
 	.iv = 30,
 	.level = 30,
@@ -5720,7 +5720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao4[] = {
     }
 };
 
-const struct TrainerPartyMember3 gTrainerParty_Lao5[] = {
+const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -5751,7 +5751,7 @@ const struct TrainerPartyMember3 gTrainerParty_Lao5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tessa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tessa[] = {
     {
 	.iv = 100,
 	.level = 12,
@@ -5769,7 +5769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tessa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Laura[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = {
     {
 	.iv = 100,
 	.level = 14,
@@ -5777,7 +5777,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laura[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -5790,7 +5790,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cora[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -5798,7 +5798,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cora[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jill[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jill[] = {
     {
 	.iv = 100,
 	.level = 27,
@@ -5806,7 +5806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jill[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = {
     {
 	.iv = 110,
 	.level = 26,
@@ -5819,7 +5819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = {
     {
 	.iv = 120,
 	.level = 29,
@@ -5832,7 +5832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = {
     {
 	.iv = 130,
 	.level = 32,
@@ -5845,7 +5845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = {
     {
 	.iv = 140,
 	.level = 35,
@@ -5858,7 +5858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -5867,7 +5867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -5880,7 +5880,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Angelica[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelica[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -5888,7 +5888,7 @@ const struct TrainerPartyMember0 gTrainerParty_Angelica[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -5897,7 +5897,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -5906,7 +5906,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -5921,7 +5921,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = {
     {
 	.iv = 40,
 	.level = 35,
@@ -5936,7 +5936,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beverly[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -5949,7 +5949,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beverly[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dawn[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dawn[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5957,7 +5957,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dawn[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nicole[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicole[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5965,7 +5965,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicole[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Denise[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -5973,7 +5973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Denise[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Beth[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -5991,7 +5991,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beth[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tara[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6004,7 +6004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tara[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Missy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -6027,7 +6027,7 @@ const struct TrainerPartyMember0 gTrainerParty_Missy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = {
     {
 	.iv = 0,
 	.level = 25,
@@ -6045,7 +6045,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6053,7 +6053,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grace[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6071,7 +6071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grace[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tanya[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6079,7 +6079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanya[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sharon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6092,7 +6092,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sharon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nikki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -6110,7 +6110,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nikki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brenda[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6118,7 +6118,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brenda[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Katie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6136,7 +6136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Susie[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6154,7 +6154,7 @@ const struct TrainerPartyMember0 gTrainerParty_Susie[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kara[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6162,7 +6162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kara[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dana[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6180,7 +6180,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dana[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Erin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Erin[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -6188,7 +6188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Erin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Debra[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6201,7 +6201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Debra[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Linda[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6214,7 +6214,7 @@ const struct TrainerPartyMember0 gTrainerParty_Linda[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6227,7 +6227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Laurel[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6245,7 +6245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laurel[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Darcy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -6253,7 +6253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darcy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -6261,7 +6261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = {
     {
 	.iv = 0,
 	.level = 41,
@@ -6269,7 +6269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = {
     {
 	.iv = 0,
 	.level = 43,
@@ -6282,7 +6282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -6300,7 +6300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Heidi[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6315,7 +6315,7 @@ const struct TrainerPartyMember1 gTrainerParty_Heidi[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Becky[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -6324,7 +6324,7 @@ const struct TrainerPartyMember1 gTrainerParty_Becky[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carol[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -6337,7 +6337,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carol[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nancy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -6350,7 +6350,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nancy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Martha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6363,7 +6363,7 @@ const struct TrainerPartyMember0 gTrainerParty_Martha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6381,7 +6381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Nina[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nina[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -6394,7 +6394,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nina[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Irene[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -6407,7 +6407,7 @@ const struct TrainerPartyMember0 gTrainerParty_Irene[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = {
     {
 	.iv = 10,
 	.level = 25,
@@ -6425,7 +6425,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = {
     {
 	.iv = 20,
 	.level = 28,
@@ -6443,7 +6443,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -6461,7 +6461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Diana5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = {
     {
 	.iv = 40,
 	.level = 40,
@@ -6479,7 +6479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -6492,7 +6492,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -6505,7 +6505,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -6518,7 +6518,7 @@ const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -6531,7 +6531,7 @@ const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -6544,7 +6544,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -6559,7 +6559,7 @@ const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = {
     {
 	.iv = 20,
 	.level = 30,
@@ -6572,7 +6572,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = {
     {
 	.iv = 30,
 	.level = 33,
@@ -6587,7 +6587,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = {
     {
 	.iv = 40,
 	.level = 36,
@@ -6602,7 +6602,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Huey[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -6610,7 +6610,7 @@ const struct TrainerPartyMember0 gTrainerParty_Huey[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edmond[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -6628,7 +6628,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edmond[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6646,7 +6646,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -6664,7 +6664,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Phillip[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = {
     {
 	.iv = 0,
 	.level = 44,
@@ -6677,7 +6677,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phillip[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Leonard[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = {
     {
 	.iv = 0,
 	.level = 43,
@@ -6695,7 +6695,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leonard[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Duncan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6708,7 +6708,7 @@ const struct TrainerPartyMember0 gTrainerParty_Duncan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = {
     {
 	.iv = 10,
 	.level = 36,
@@ -6726,7 +6726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = {
     {
 	.iv = 20,
 	.level = 39,
@@ -6744,7 +6744,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = {
     {
 	.iv = 30,
 	.level = 42,
@@ -6762,7 +6762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = {
     {
 	.iv = 40,
 	.level = 45,
@@ -6780,7 +6780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous11[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -6793,7 +6793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous12[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -6811,7 +6811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous13[] = {
     {
 	.iv = 0,
 	.level = 23,
@@ -6819,7 +6819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sonny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sonny[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6827,7 +6827,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sonny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Donovan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donovan[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6840,7 +6840,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donovan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Gerald[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gerald[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6858,7 +6858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gerald[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6871,7 +6871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kody[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kody[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -6889,7 +6889,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kody[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tevin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tevin[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6897,7 +6897,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tevin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Damon[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Damon[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -6910,7 +6910,7 @@ const struct TrainerPartyMember0 gTrainerParty_Damon[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Pablo[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6918,7 +6918,7 @@ const struct TrainerPartyMember0 gTrainerParty_Pablo[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -6931,7 +6931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hector1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector1[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6939,7 +6939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Hector2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector2[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -6947,7 +6947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -6960,7 +6960,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -6973,7 +6973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -6986,7 +6986,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = {
     {
 	.iv = 0,
 	.level = 35,
@@ -6999,7 +6999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = {
     {
 	.iv = 150,
 	.level = 44,
@@ -7032,7 +7032,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7040,7 +7040,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7058,7 +7058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7076,7 +7076,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7084,7 +7084,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7102,7 +7102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7120,7 +7120,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7128,7 +7128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7146,7 +7146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7164,7 +7164,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7172,7 +7172,7 @@ const struct TrainerPartyMember0 gTrainerParty_May1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7190,7 +7190,7 @@ const struct TrainerPartyMember0 gTrainerParty_May2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7208,7 +7208,7 @@ const struct TrainerPartyMember0 gTrainerParty_May3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7216,7 +7216,7 @@ const struct TrainerPartyMember0 gTrainerParty_May4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7234,7 +7234,7 @@ const struct TrainerPartyMember0 gTrainerParty_May5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May6[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7252,7 +7252,7 @@ const struct TrainerPartyMember0 gTrainerParty_May6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May7[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = {
     {
 	.iv = 0,
 	.level = 5,
@@ -7260,7 +7260,7 @@ const struct TrainerPartyMember0 gTrainerParty_May7[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May8[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = {
     {
 	.iv = 50,
 	.level = 18,
@@ -7278,7 +7278,7 @@ const struct TrainerPartyMember0 gTrainerParty_May8[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May9[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -7296,7 +7296,7 @@ const struct TrainerPartyMember0 gTrainerParty_May9[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -7329,7 +7329,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Riley[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Riley[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -7347,7 +7347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Riley[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Aidan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -7360,7 +7360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aidan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = {
     {
 	.iv = 10,
 	.level = 22,
@@ -7393,7 +7393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = {
     {
 	.iv = 20,
 	.level = 25,
@@ -7426,7 +7426,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = {
     {
 	.iv = 30,
 	.level = 28,
@@ -7459,7 +7459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = {
     {
 	.iv = 40,
 	.level = 31,
@@ -7492,7 +7492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = {
     {
 	.iv = 0,
 	.level = 12,
@@ -7525,7 +7525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexia[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -7538,7 +7538,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Danielle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danielle[] = {
     {
 	.iv = 0,
 	.level = 24,
@@ -7546,7 +7546,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danielle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = {
     {
 	.iv = 10,
 	.level = 22,
@@ -7579,7 +7579,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = {
     {
 	.iv = 20,
 	.level = 25,
@@ -7612,7 +7612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = {
     {
 	.iv = 30,
 	.level = 28,
@@ -7645,7 +7645,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = {
     {
 	.iv = 40,
 	.level = 31,
@@ -7678,7 +7678,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -7686,7 +7686,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Carlos[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlos[] = {
     {
 	.iv = 50,
 	.level = 29,
@@ -7704,7 +7704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carlos[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = {
     {
 	.iv = 50,
 	.level = 39,
@@ -7712,7 +7712,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = {
     {
 	.iv = 60,
 	.level = 31,
@@ -7720,7 +7720,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = {
     {
 	.iv = 70,
 	.level = 34,
@@ -7728,7 +7728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = {
     {
 	.iv = 80,
 	.level = 37,
@@ -7736,7 +7736,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = {
     {
 	.iv = 90,
 	.level = 39,
@@ -7749,7 +7749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = {
     {
 	.iv = 50,
 	.level = 27,
@@ -7762,7 +7762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jenna[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = {
     {
 	.iv = 50,
 	.level = 29,
@@ -7780,7 +7780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenna[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sophia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -7793,7 +7793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sophia[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = {
     {
 	.iv = 60,
 	.level = 30,
@@ -7806,7 +7806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = {
     {
 	.iv = 70,
 	.level = 33,
@@ -7819,7 +7819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = {
     {
 	.iv = 80,
 	.level = 36,
@@ -7832,7 +7832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = {
     {
 	.iv = 90,
 	.level = 39,
@@ -7845,7 +7845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -7858,7 +7858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -7871,7 +7871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -7894,7 +7894,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -7907,7 +7907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -7915,7 +7915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = {
     {
 	.iv = 0,
 	.level = 37,
@@ -7928,7 +7928,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = {
     {
 	.iv = 0,
 	.level = 38,
@@ -7936,7 +7936,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -7954,7 +7954,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -7962,7 +7962,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -7970,7 +7970,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -7983,7 +7983,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -7996,7 +7996,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8009,7 +8009,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -8022,7 +8022,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -8035,7 +8035,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = {
     {
 	.iv = 0,
 	.level = 11,
@@ -8043,7 +8043,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8056,7 +8056,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8069,7 +8069,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8087,7 +8087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -8095,7 +8095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -8108,7 +8108,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = {
     {
 	.iv = 0,
 	.level = 17,
@@ -8116,7 +8116,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -8134,7 +8134,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8147,7 +8147,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8160,7 +8160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -8168,7 +8168,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -8186,7 +8186,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt54[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -8194,7 +8194,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous14[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -8207,7 +8207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous15[] = {
     {
 	.iv = 50,
 	.level = 30,
@@ -8220,7 +8220,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = {
     {
 	.iv = 50,
 	.level = 32,
@@ -8238,7 +8238,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = {
     {
 	.iv = 50,
 	.level = 20,
@@ -8256,7 +8256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous16[] = {
     {
 	.iv = 50,
 	.level = 21,
@@ -8269,7 +8269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney1[] = {
     {
 	.iv = 50,
 	.level = 28,
@@ -8282,7 +8282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney2[] = {
     {
 	.iv = 50,
 	.level = 38,
@@ -8295,7 +8295,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = {
     {
 	.iv = 150,
 	.level = 41,
@@ -8313,7 +8313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = {
     {
 	.iv = 150,
 	.level = 24,
@@ -8331,7 +8331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tiana[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = {
     {
 	.iv = 0,
 	.level = 4,
@@ -8344,7 +8344,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiana[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = {
     {
 	.iv = 0,
 	.level = 7,
@@ -8357,7 +8357,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Janice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -8365,7 +8365,7 @@ const struct TrainerPartyMember0 gTrainerParty_Janice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Vivi[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = {
     {
 	.iv = 100,
 	.level = 15,
@@ -8383,7 +8383,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vivi[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = {
     {
 	.iv = 10,
 	.level = 26,
@@ -8396,7 +8396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -8409,7 +8409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = {
     {
 	.iv = 30,
 	.level = 32,
@@ -8422,7 +8422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Haley5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = {
     {
 	.iv = 40,
 	.level = 34,
@@ -8440,7 +8440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Sally[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8448,7 +8448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sally[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Robin[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = {
     {
 	.iv = 0,
 	.level = 14,
@@ -8466,7 +8466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robin[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Andrea[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = {
     {
 	.iv = 100,
 	.level = 41,
@@ -8474,7 +8474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrea[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Crissy[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = {
     {
 	.iv = 100,
 	.level = 40,
@@ -8487,7 +8487,7 @@ const struct TrainerPartyMember0 gTrainerParty_Crissy[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Rick[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = {
     {
 	.iv = 0,
 	.level = 4,
@@ -8500,7 +8500,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rick[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lyle[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = {
     {
 	.iv = 0,
 	.level = 3,
@@ -8533,7 +8533,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lyle[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jose[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = {
     {
 	.iv = 50,
 	.level = 8,
@@ -8551,7 +8551,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jose[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Doug[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8564,7 +8564,7 @@ const struct TrainerPartyMember0 gTrainerParty_Doug[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Greg[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8577,7 +8577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Greg[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kent[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -8585,7 +8585,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kent[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -8593,7 +8593,7 @@ const struct TrainerPartyMember0 gTrainerParty_James1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = {
     {
 	.iv = 10,
 	.level = 27,
@@ -8601,7 +8601,7 @@ const struct TrainerPartyMember0 gTrainerParty_James2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = {
     {
 	.iv = 20,
 	.level = 29,
@@ -8614,7 +8614,7 @@ const struct TrainerPartyMember0 gTrainerParty_James3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = {
     {
 	.iv = 30,
 	.level = 31,
@@ -8632,7 +8632,7 @@ const struct TrainerPartyMember0 gTrainerParty_James4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_James5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -8655,7 +8655,7 @@ const struct TrainerPartyMember0 gTrainerParty_James5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brice[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -8668,7 +8668,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brice[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8691,7 +8691,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lenny[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -8704,7 +8704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lenny[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = {
     {
 	.iv = 0,
 	.level = 18,
@@ -8722,7 +8722,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = {
     {
 	.iv = 0,
 	.level = 22,
@@ -8740,7 +8740,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Clark[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = {
     {
 	.iv = 0,
 	.level = 8,
@@ -8758,7 +8758,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clark[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eric[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = {
     {
 	.iv = 0,
 	.level = 21,
@@ -8771,7 +8771,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eric[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = {
     {
 	.iv = 0,
 	.level = 9,
@@ -8780,7 +8780,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Mike1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = {
     {
 	.iv = 0,
 	.level = 10,
@@ -8795,7 +8795,7 @@ const struct TrainerPartyMember1 gTrainerParty_Mike1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Mike2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = {
     {
 	.iv = 0,
 	.level = 16,
@@ -8813,7 +8813,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mike2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = {
     {
 	.iv = 10,
 	.level = 24,
@@ -8836,7 +8836,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = {
     {
 	.iv = 20,
 	.level = 27,
@@ -8859,7 +8859,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = {
     {
 	.iv = 30,
 	.level = 30,
@@ -8882,7 +8882,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Trent5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = {
     {
 	.iv = 40,
 	.level = 33,
@@ -8905,7 +8905,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -8918,7 +8918,7 @@ const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -8931,7 +8931,7 @@ const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal1[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -8944,7 +8944,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal2[] = {
     {
 	.iv = 10,
 	.level = 30,
@@ -8957,7 +8957,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal3[] = {
     {
 	.iv = 20,
 	.level = 33,
@@ -8970,7 +8970,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal4[] = {
     {
 	.iv = 30,
 	.level = 36,
@@ -8983,7 +8983,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal5[] = {
     {
 	.iv = 40,
 	.level = 39,
@@ -8996,7 +8996,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Johanna[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = {
     {
 	.iv = 0,
 	.level = 13,
@@ -9004,7 +9004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Johanna[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Zane[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Zane[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -9013,7 +9013,7 @@ const struct TrainerPartyMember1 gTrainerParty_Zane[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Vivian[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = {
     {
 	.iv = 100,
 	.level = 19,
@@ -9022,7 +9022,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vivian[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Sadie[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Sadie[] = {
     {
 	.iv = 100,
 	.level = 24,
@@ -9031,7 +9031,7 @@ const struct TrainerPartyMember1 gTrainerParty_Sadie[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo2[] = {
     {
 	.iv = 0,
 	.level = 26,
@@ -9046,7 +9046,7 @@ const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Keigo[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = {
     {
 	.iv = 0,
 	.level = 29,
@@ -9061,7 +9061,7 @@ const struct TrainerPartyMember1 gTrainerParty_Keigo[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Tsunao[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -9082,7 +9082,7 @@ const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Terrell[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terrell[] = {
     {
 	.iv = 100,
 	.level = 29,
@@ -9095,7 +9095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Terrell[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Kylee[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kylee[] = {
     {
 	.iv = 100,
 	.level = 30,
@@ -9103,7 +9103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kylee[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wally2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = {
     {
 	.iv = 30,
 	.level = 16,
@@ -9111,7 +9111,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wally2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = {
     {
 	.iv = 150,
 	.level = 47,
@@ -9144,7 +9144,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = {
     {
 	.iv = 150,
 	.level = 50,
@@ -9177,7 +9177,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = {
     {
 	.iv = 150,
 	.level = 53,
@@ -9210,7 +9210,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally5[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_Wally6[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = {
     {
 	.iv = 150,
 	.level = 56,
@@ -9243,7 +9243,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally6[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9266,7 +9266,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9289,7 +9289,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9312,7 +9312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May10[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9335,7 +9335,7 @@ const struct TrainerPartyMember0 gTrainerParty_May10[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May11[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9358,7 +9358,7 @@ const struct TrainerPartyMember0 gTrainerParty_May11[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_May12[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = {
     {
 	.iv = 150,
 	.level = 31,
@@ -9381,7 +9381,7 @@ const struct TrainerPartyMember0 gTrainerParty_May12[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Jonah[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9404,7 +9404,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jonah[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Henry[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = {
     {
 	.iv = 0,
 	.level = 31,
@@ -9422,7 +9422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Henry[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Roger[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = {
     {
 	.iv = 0,
 	.level = 15,
@@ -9445,7 +9445,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roger[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Alexa[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = {
     {
 	.iv = 100,
 	.level = 35,
@@ -9458,7 +9458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexa[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Ruben[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -9476,7 +9476,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ruben[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Koji[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji[] = {
     {
 	.iv = 100,
 	.level = 34,
@@ -9489,7 +9489,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koji[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Wayne[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = {
     {
 	.iv = 0,
 	.level = 30,
@@ -9512,7 +9512,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wayne[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Byron[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Byron[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9525,7 +9525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Byron[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Reed[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = {
     {
 	.iv = 0,
 	.level = 32,
@@ -9548,7 +9548,7 @@ const struct TrainerPartyMember0 gTrainerParty_Reed[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Tisha[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = {
     {
 	.iv = 0,
 	.level = 33,
@@ -9566,7 +9566,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tisha[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = {
     {
 	.iv = 0,
 	.level = 20,
@@ -9579,7 +9579,7 @@ const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = {
     {
 	.iv = 0,
 	.level = 34,
@@ -9594,7 +9594,7 @@ const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = {
     {
 	.iv = 0,
 	.level = 19,
@@ -9609,7 +9609,7 @@ const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = {
     {
 	.iv = 0,
 	.level = 27,
@@ -9624,7 +9624,7 @@ const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = {
     {
 	.iv = 200,
 	.level = 40,
@@ -9639,7 +9639,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = {
     {
 	.iv = 210,
 	.level = 43,
@@ -9654,7 +9654,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = {
     {
 	.iv = 220,
 	.level = 46,
@@ -9669,7 +9669,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = {
     {
 	.iv = 230,
 	.level = 49,
@@ -9684,7 +9684,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = {
     }
 };
 
-const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = {
+const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = {
     {
 	.iv = 240,
 	.level = 52,
@@ -9699,7 +9699,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -9712,7 +9712,7 @@ const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam1[] = {
     {
 	.iv = 0,
 	.level = 36,
@@ -9725,7 +9725,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam2[] = {
     {
 	.iv = 0,
 	.level = 42,
@@ -9738,7 +9738,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam3[] = {
     {
 	.iv = 0,
 	.level = 45,
@@ -9751,7 +9751,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam4[] = {
     {
 	.iv = 0,
 	.level = 48,
@@ -9764,7 +9764,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam5[] = {
     {
 	.iv = 0,
 	.level = 51,
@@ -9777,7 +9777,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = {
     {
 	.iv = 0,
 	.level = 28,
@@ -9790,7 +9790,7 @@ const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = {
     }
 };
 
-const struct TrainerPartyMember0 gTrainerParty_Eugene[] = {
+const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eugene[] = {
     {
 	.iv = 0,
 	.level = 30,
diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h
index c7a0e7744..46d64d8dc 100644
--- a/src/data/trainers_de.h
+++ b/src/data/trainers_de.h
@@ -1,5 +1,5 @@
 const struct Trainer gTrainers[] = {
-    [OPPONENT_NONE] =
+    [TRAINER_NONE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 0,
-        .party = NULL
+        .party = {.NoItemDefaultMoves = NULL }
     },
 
-    [OPPONENT_ARCHIE_1] =
+    [TRAINER_ARCHIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Archie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 }
     },
 
-    [OPPONENT_GRUNT_1] =
+    [TRAINER_GRUNT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 }
     },
 
-    [OPPONENT_GRUNT_2] =
+    [TRAINER_GRUNT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 }
     },
 
-    [OPPONENT_GRUNT_3] =
+    [TRAINER_GRUNT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 }
     },
 
-    [OPPONENT_GRUNT_4] =
+    [TRAINER_GRUNT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 }
     },
 
-    [OPPONENT_GRUNT_5] =
+    [TRAINER_GRUNT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 }
     },
 
-    [OPPONENT_GRUNT_6] =
+    [TRAINER_GRUNT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 }
     },
 
-    [OPPONENT_GRUNT_7] =
+    [TRAINER_GRUNT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 }
     },
 
-    [OPPONENT_GRUNT_8] =
+    [TRAINER_GRUNT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 }
     },
 
-    [OPPONENT_GRUNT_9] =
+    [TRAINER_GRUNT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 }
     },
 
-    [OPPONENT_GRUNT_10] =
+    [TRAINER_GRUNT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 }
     },
 
-    [OPPONENT_GRUNT_11] =
+    [TRAINER_GRUNT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 }
     },
 
-    [OPPONENT_GRUNT_12] =
+    [TRAINER_GRUNT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 }
     },
 
-    [OPPONENT_GRUNT_13] =
+    [TRAINER_GRUNT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 }
     },
 
-    [OPPONENT_GRUNT_14] =
+    [TRAINER_GRUNT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 }
     },
 
-    [OPPONENT_GRUNT_15] =
+    [TRAINER_GRUNT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 }
     },
 
-    [OPPONENT_GRUNT_16] =
+    [TRAINER_GRUNT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 }
     },
 
-    [OPPONENT_GRUNT_17] =
+    [TRAINER_GRUNT_17] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt17
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 }
     },
 
-    [OPPONENT_GRUNT_18] =
+    [TRAINER_GRUNT_18] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt18
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 }
     },
 
-    [OPPONENT_GRUNT_19] =
+    [TRAINER_GRUNT_19] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt19
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 }
     },
 
-    [OPPONENT_GRUNT_20] =
+    [TRAINER_GRUNT_20] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt20
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 }
     },
 
-    [OPPONENT_GRUNT_21] =
+    [TRAINER_GRUNT_21] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt21
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 }
     },
 
-    [OPPONENT_GRUNT_22] =
+    [TRAINER_GRUNT_22] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt22
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 }
     },
 
-    [OPPONENT_GRUNT_23] =
+    [TRAINER_GRUNT_23] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt23
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 }
     },
 
-    [OPPONENT_GRUNT_24] =
+    [TRAINER_GRUNT_24] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt24
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 }
     },
 
-    [OPPONENT_GRUNT_25] =
+    [TRAINER_GRUNT_25] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt25
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 }
     },
 
-    [OPPONENT_GRUNT_26] =
+    [TRAINER_GRUNT_26] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt26
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 }
     },
 
-    [OPPONENT_GRUNT_27] =
+    [TRAINER_GRUNT_27] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt27
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 }
     },
 
-    [OPPONENT_ANONYMOUS_1] =
+    [TRAINER_ANONYMOUS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 }
     },
 
-    [OPPONENT_MATT_1] =
+    [TRAINER_MATT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Matt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 }
     },
 
-    [OPPONENT_MATT_2] =
+    [TRAINER_MATT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Matt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 }
     },
 
-    [OPPONENT_SHELLY_1] =
+    [TRAINER_SHELLY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 }
     },
 
-    [OPPONENT_SHELLY_2] =
+    [TRAINER_SHELLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 }
     },
 
-    [OPPONENT_ARCHIE_2] =
+    [TRAINER_ARCHIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 }
     },
 
-    [OPPONENT_ARCHIE_3] =
+    [TRAINER_ARCHIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 }
     },
 
-    [OPPONENT_DAISY] =
+    [TRAINER_DAISY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisy }
     },
 
-    [OPPONENT_ROSE_1] =
+    [TRAINER_ROSE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 }
     },
 
-    [OPPONENT_LILY] =
+    [TRAINER_LILY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lily
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lily }
     },
 
-    [OPPONENT_VIOLET] =
+    [TRAINER_VIOLET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Violet
+        .party = {.NoItemDefaultMoves = gTrainerParty_Violet }
     },
 
-    [OPPONENT_ROSE_2] =
+    [TRAINER_ROSE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 }
     },
 
-    [OPPONENT_ROSE_3] =
+    [TRAINER_ROSE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 }
     },
 
-    [OPPONENT_ROSE_4] =
+    [TRAINER_ROSE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 }
     },
 
-    [OPPONENT_ROSE_5] =
+    [TRAINER_ROSE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 }
     },
 
-    [OPPONENT_DUSTY_1] =
+    [TRAINER_DUSTY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty1
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 }
     },
 
-    [OPPONENT_CHIP] =
+    [TRAINER_CHIP] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Chip
+        .party = {.NoItemCustomMoves = gTrainerParty_Chip }
     },
 
-    [OPPONENT_FOSTER] =
+    [TRAINER_FOSTER] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Foster
+        .party = {.NoItemCustomMoves = gTrainerParty_Foster }
     },
 
-    [OPPONENT_DUSTY_2] =
+    [TRAINER_DUSTY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty2
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 }
     },
 
-    [OPPONENT_DUSTY_3] =
+    [TRAINER_DUSTY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty3
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 }
     },
 
-    [OPPONENT_DUSTY_4] =
+    [TRAINER_DUSTY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty4
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 }
     },
 
-    [OPPONENT_DUSTY_5] =
+    [TRAINER_DUSTY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty5
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_1] =
+    [TRAINER_GABBY_AND_TY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 }
     },
 
-    [OPPONENT_GABBY_AND_TY_2] =
+    [TRAINER_GABBY_AND_TY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 }
     },
 
-    [OPPONENT_GABBY_AND_TY_3] =
+    [TRAINER_GABBY_AND_TY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 }
     },
 
-    [OPPONENT_GABBY_AND_TY_4] =
+    [TRAINER_GABBY_AND_TY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 }
     },
 
-    [OPPONENT_GABBY_AND_TY_5] =
+    [TRAINER_GABBY_AND_TY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_6] =
+    [TRAINER_GABBY_AND_TY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy6
+        .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 }
     },
 
-    [OPPONENT_LOLA_1] =
+    [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 }
     },
 
-    [OPPONENT_CARMEN] =
+    [TRAINER_CARMEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Carmen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carmen }
     },
 
-    [OPPONENT_GWEN] =
+    [TRAINER_GWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gwen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gwen }
     },
 
-    [OPPONENT_LOLA_2] =
+    [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 }
     },
 
-    [OPPONENT_LOLA_3] =
+    [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 }
     },
 
-    [OPPONENT_LOLA_4] =
+    [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 }
     },
 
-    [OPPONENT_LOLA_5] =
+    [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 }
     },
 
-    [OPPONENT_RICKY_1] =
+    [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky1
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 }
     },
 
-    [OPPONENT_SIMON] =
+    [TRAINER_SIMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Simon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Simon }
     },
 
-    [OPPONENT_CHARLIE] =
+    [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Charlie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Charlie }
     },
 
-    [OPPONENT_RICKY_2] =
+    [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky2
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 }
     },
 
-    [OPPONENT_RICKY_3] =
+    [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky3
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 }
     },
 
-    [OPPONENT_RICKY_4] =
+    [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky4
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 }
     },
 
-    [OPPONENT_RICKY_5] =
+    [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky5
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 }
     },
 
-    [OPPONENT_RANDALL] =
+    [TRAINER_RANDALL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Randall
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randall }
     },
 
-    [OPPONENT_PARKER] =
+    [TRAINER_PARKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Parker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Parker }
     },
 
-    [OPPONENT_GEORGE] =
+    [TRAINER_GEORGE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_George
+        .party = {.NoItemDefaultMoves = gTrainerParty_George }
     },
 
-    [OPPONENT_BERKE] =
+    [TRAINER_BERKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Berke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Berke }
     },
 
-    [OPPONENT_CLYDE] =
+    [TRAINER_CLYDE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Clyde
+        .party = {.NoItemCustomMoves = gTrainerParty_Clyde }
     },
 
-    [OPPONENT_VINCENT] =
+    [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vincent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vincent }
     },
 
-    [OPPONENT_LEROY] =
+    [TRAINER_LEROY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Leroy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leroy }
     },
 
-    [OPPONENT_WILTON_1] =
+    [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 }
     },
 
-    [OPPONENT_EDGAR] =
+    [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Edgar
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edgar }
     },
 
-    [OPPONENT_ALBERT] =
+    [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Albert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Albert }
     },
 
-    [OPPONENT_SAMUEL] =
+    [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Samuel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samuel }
     },
 
-    [OPPONENT_VITO] =
+    [TRAINER_VITO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Vito
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vito }
     },
 
-    [OPPONENT_OWEN] =
+    [TRAINER_OWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Owen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Owen }
     },
 
-    [OPPONENT_WILTON_2] =
+    [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 }
     },
 
-    [OPPONENT_WILTON_3] =
+    [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 }
     },
 
-    [OPPONENT_WILTON_4] =
+    [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 }
     },
 
-    [OPPONENT_WILTON_5] =
+    [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 }
     },
 
-    [OPPONENT_WARREN] =
+    [TRAINER_WARREN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Warren
+        .party = {.NoItemDefaultMoves = gTrainerParty_Warren }
     },
 
-    [OPPONENT_MARY] =
+    [TRAINER_MARY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Mary
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mary }
     },
 
-    [OPPONENT_LORI] =
+    [TRAINER_LORI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Lori
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lori }
     },
 
-    [OPPONENT_JODY] =
+    [TRAINER_JODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jody }
     },
 
-    [OPPONENT_WENDY] =
+    [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Wendy
+        .party = {.NoItemCustomMoves = gTrainerParty_Wendy }
     },
 
-    [OPPONENT_ELAINE] =
+    [TRAINER_ELAINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Elaine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elaine }
     },
 
-    [OPPONENT_BROOKE_1] =
+    [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 }
     },
 
-    [OPPONENT_JENNIFER] =
+    [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jennifer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer }
     },
 
-    [OPPONENT_HOPE] =
+    [TRAINER_HOPE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Hope
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hope }
     },
 
-    [OPPONENT_SHANNON] =
+    [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Shannon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shannon }
     },
 
-    [OPPONENT_MICHELLE] =
+    [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Michelle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Michelle }
     },
 
-    [OPPONENT_CAROLINE] =
+    [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Caroline
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caroline }
     },
 
-    [OPPONENT_JULIE] =
+    [TRAINER_JULIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Julie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Julie }
     },
 
-    [OPPONENT_BROOKE_2] =
+    [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 }
     },
 
-    [OPPONENT_BROOKE_3] =
+    [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 }
     },
 
-    [OPPONENT_BROOKE_4] =
+    [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 }
     },
 
-    [OPPONENT_BROOKE_5] =
+    [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 }
     },
 
-    [OPPONENT_PATRICIA] =
+    [TRAINER_PATRICIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Patricia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Patricia }
     },
 
-    [OPPONENT_KINDRA] =
+    [TRAINER_KINDRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kindra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kindra }
     },
 
-    [OPPONENT_TAMMY] =
+    [TRAINER_TAMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tammy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tammy }
     },
 
-    [OPPONENT_VALERIE_1] =
+    [TRAINER_VALERIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 }
     },
 
-    [OPPONENT_TASHA] =
+    [TRAINER_TASHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tasha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tasha }
     },
 
-    [OPPONENT_VALERIE_2] =
+    [TRAINER_VALERIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 }
     },
 
-    [OPPONENT_VALERIE_3] =
+    [TRAINER_VALERIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 }
     },
 
-    [OPPONENT_VALERIE_4] =
+    [TRAINER_VALERIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 }
     },
 
-    [OPPONENT_VALERIE_5] =
+    [TRAINER_VALERIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Valerie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 }
     },
 
-    [OPPONENT_CINDY_1] =
+    [TRAINER_CINDY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy1
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 }
     },
 
-    [OPPONENT_ANONYMOUS_2] =
+    [TRAINER_ANONYMOUS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 }
     },
 
-    [OPPONENT_BRIANNA_1] =
+    [TRAINER_BRIANNA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brianna1
+        .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 }
     },
 
-    [OPPONENT_CINDY_2] =
+    [TRAINER_CINDY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 }
     },
 
-    [OPPONENT_BRIANNA_2] =
+    [TRAINER_BRIANNA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brianna2
+        .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 }
     },
 
-    [OPPONENT_ANETTE] =
+    [TRAINER_ANETTE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anette
+        .party = {.ItemDefaultMoves = gTrainerParty_Anette }
     },
 
-    [OPPONENT_CINDY_3] =
+    [TRAINER_CINDY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy3
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 }
     },
 
-    [OPPONENT_CINDY_4] =
+    [TRAINER_CINDY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy4
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 }
     },
 
-    [OPPONENT_CINDY_5] =
+    [TRAINER_CINDY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy5
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 }
     },
 
-    [OPPONENT_CINDY_6] =
+    [TRAINER_CINDY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy6
+        .party = {.ItemCustomMoves = gTrainerParty_Cindy6 }
     },
 
-    [OPPONENT_MELISSA] =
+    [TRAINER_MELISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Melissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Melissa }
     },
 
-    [OPPONENT_SHEILA] =
+    [TRAINER_SHEILA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sheila
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sheila }
     },
 
-    [OPPONENT_SHIRLEY] =
+    [TRAINER_SHIRLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Shirley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shirley }
     },
 
-    [OPPONENT_JESSICA_1] =
+    [TRAINER_JESSICA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica1
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 }
     },
 
-    [OPPONENT_CONNIE] =
+    [TRAINER_CONNIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Connie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connie }
     },
 
-    [OPPONENT_BRIDGET] =
+    [TRAINER_BRIDGET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Bridget
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bridget }
     },
 
-    [OPPONENT_OLIVIA] =
+    [TRAINER_OLIVIA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Olivia
+        .party = {.NoItemCustomMoves = gTrainerParty_Olivia }
     },
 
-    [OPPONENT_TIFFANY] =
+    [TRAINER_TIFFANY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tiffany
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany }
     },
 
-    [OPPONENT_JESSICA_2] =
+    [TRAINER_JESSICA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica2
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 }
     },
 
-    [OPPONENT_JESSICA_3] =
+    [TRAINER_JESSICA_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica3
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 }
     },
 
-    [OPPONENT_JESSICA_4] =
+    [TRAINER_JESSICA_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica4
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 }
     },
 
-    [OPPONENT_JESSICA_5] =
+    [TRAINER_JESSICA_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica5
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 }
     },
 
-    [OPPONENT_WINSTON_1] =
+    [TRAINER_WINSTON_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston1
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston1 }
     },
 
-    [OPPONENT_ANONYMOUS_3] =
+    [TRAINER_ANONYMOUS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 }
     },
 
-    [OPPONENT_GARRET] =
+    [TRAINER_GARRET] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Garret
+        .party = {.ItemDefaultMoves = gTrainerParty_Garret }
     },
 
-    [OPPONENT_WINSTON_2] =
+    [TRAINER_WINSTON_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston2
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston2 }
     },
 
-    [OPPONENT_WINSTON_3] =
+    [TRAINER_WINSTON_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston3
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston3 }
     },
 
-    [OPPONENT_WINSTON_4] =
+    [TRAINER_WINSTON_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston4
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston4 }
     },
 
-    [OPPONENT_WINSTON_5] =
+    [TRAINER_WINSTON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston5
+        .party = {.ItemCustomMoves = gTrainerParty_Winston5 }
     },
 
-    [OPPONENT_STEVE_1] =
+    [TRAINER_STEVE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 }
     },
 
-    [OPPONENT_CHRIS] =
+    [TRAINER_CHRIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Chris
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chris }
     },
 
-    [OPPONENT_MARK] =
+    [TRAINER_MARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Mark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mark }
     },
 
-    [OPPONENT_KENN] =
+    [TRAINER_KENN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kenn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kenn }
     },
 
-    [OPPONENT_STEVE_2] =
+    [TRAINER_STEVE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 }
     },
 
-    [OPPONENT_STEVE_3] =
+    [TRAINER_STEVE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 }
     },
 
-    [OPPONENT_STEVE_4] =
+    [TRAINER_STEVE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 }
     },
 
-    [OPPONENT_STEVE_5] =
+    [TRAINER_STEVE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 }
     },
 
-    [OPPONENT_LUIS] =
+    [TRAINER_LUIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Luis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Luis }
     },
 
-    [OPPONENT_AUSTIN] =
+    [TRAINER_AUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Austin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Austin }
     },
 
-    [OPPONENT_DOUGLAS] =
+    [TRAINER_DOUGLAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Douglas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Douglas }
     },
 
-    [OPPONENT_DARRIN] =
+    [TRAINER_DARRIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darrin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darrin }
     },
 
-    [OPPONENT_TONY_1] =
+    [TRAINER_TONY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 }
     },
 
-    [OPPONENT_JEROME] =
+    [TRAINER_JEROME] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerome
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerome }
     },
 
-    [OPPONENT_MATTHEW] =
+    [TRAINER_MATTHEW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Matthew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matthew }
     },
 
-    [OPPONENT_DAVID] =
+    [TRAINER_DAVID] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_David
+        .party = {.NoItemDefaultMoves = gTrainerParty_David }
     },
 
-    [OPPONENT_SPENCER] =
+    [TRAINER_SPENCER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Spencer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Spencer }
     },
 
-    [OPPONENT_ROLAND] =
+    [TRAINER_ROLAND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Roland
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roland }
     },
 
-    [OPPONENT_CODY] =
+    [TRAINER_CODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cody }
     },
 
-    [OPPONENT_STAN] =
+    [TRAINER_STAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Stan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Stan }
     },
 
-    [OPPONENT_BARRY] =
+    [TRAINER_BARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Barry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barry }
     },
 
-    [OPPONENT_DEAN] =
+    [TRAINER_DEAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dean
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dean }
     },
 
-    [OPPONENT_RODNEY] =
+    [TRAINER_RODNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rodney
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rodney }
     },
 
-    [OPPONENT_RICHARD] =
+    [TRAINER_RICHARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Richard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Richard }
     },
 
-    [OPPONENT_HERMAN] =
+    [TRAINER_HERMAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Herman
+        .party = {.NoItemDefaultMoves = gTrainerParty_Herman }
     },
 
-    [OPPONENT_ANONYMOUS_4] =
+    [TRAINER_ANONYMOUS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 }
     },
 
-    [OPPONENT_GILBERT] =
+    [TRAINER_GILBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gilbert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert }
     },
 
-    [OPPONENT_FRANKLIN] =
+    [TRAINER_FRANKLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Franklin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Franklin }
     },
 
-    [OPPONENT_DANNY] =
+    [TRAINER_DANNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Danny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danny }
     },
 
-    [OPPONENT_JACK] =
+    [TRAINER_JACK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jack
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jack }
     },
 
-    [OPPONENT_DUDLEY] =
+    [TRAINER_DUDLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dudley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dudley }
     },
 
-    [OPPONENT_CHAD] =
+    [TRAINER_CHAD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chad
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chad }
     },
 
-    [OPPONENT_TONY_2] =
+    [TRAINER_TONY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 }
     },
 
-    [OPPONENT_TONY_3] =
+    [TRAINER_TONY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 }
     },
 
-    [OPPONENT_TONY_4] =
+    [TRAINER_TONY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 }
     },
 
-    [OPPONENT_TONY_5] =
+    [TRAINER_TONY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 }
     },
 
-    [OPPONENT_HIDEKI] =
+    [TRAINER_HIDEKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hideki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideki }
     },
 
-    [OPPONENT_HITOSHI] =
+    [TRAINER_HITOSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hitoshi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi }
     },
 
-    [OPPONENT_KIYO] =
+    [TRAINER_KIYO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kiyo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo }
     },
 
-    [OPPONENT_KOICHI] =
+    [TRAINER_KOICHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koichi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koichi }
     },
 
-    [OPPONENT_NOB_1] =
+    [TRAINER_NOB_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 }
     },
 
-    [OPPONENT_NOB_2] =
+    [TRAINER_NOB_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 }
     },
 
-    [OPPONENT_NOB_3] =
+    [TRAINER_NOB_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nob3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 }
     },
 
-    [OPPONENT_NOB_4] =
+    [TRAINER_NOB_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nob4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 }
     },
 
-    [OPPONENT_NOB_5] =
+    [TRAINER_NOB_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Nob5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nob5 }
     },
 
-    [OPPONENT_YUJI] =
+    [TRAINER_YUJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Yuji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yuji }
     },
 
-    [OPPONENT_DAISUKE] =
+    [TRAINER_DAISUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke }
     },
 
-    [OPPONENT_ATSUSHI] =
+    [TRAINER_ATSUSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Atsushi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi }
     },
 
-    [OPPONENT_KIRK] =
+    [TRAINER_KIRK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kirk
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kirk }
     },
 
-    [OPPONENT_SCOTT] =
+    [TRAINER_SCOTT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Scott
+        .party = {.NoItemDefaultMoves = gTrainerParty_Scott }
     },
 
-    [OPPONENT_HARVEY] =
+    [TRAINER_HARVEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Harvey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Harvey }
     },
 
-    [OPPONENT_SHAWN] =
+    [TRAINER_SHAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Shawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shawn }
     },
 
-    [OPPONENT_RANDY] =
+    [TRAINER_RANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Randy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randy }
     },
 
-    [OPPONENT_DALTON_1] =
+    [TRAINER_DALTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 }
     },
 
-    [OPPONENT_DALTON_2] =
+    [TRAINER_DALTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 }
     },
 
-    [OPPONENT_DALTON_3] =
+    [TRAINER_DALTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 }
     },
 
-    [OPPONENT_DALTON_4] =
+    [TRAINER_DALTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 }
     },
 
-    [OPPONENT_DALTON_5] =
+    [TRAINER_DALTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 }
     },
 
-    [OPPONENT_COLE] =
+    [TRAINER_COLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cole }
     },
 
-    [OPPONENT_FLINT] =
+    [TRAINER_FLINT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Flint
+        .party = {.NoItemDefaultMoves = gTrainerParty_Flint }
     },
 
-    [OPPONENT_AXLE] =
+    [TRAINER_AXLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Axle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Axle }
     },
 
-    [OPPONENT_JAKE] =
+    [TRAINER_JAKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jake
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jake }
     },
 
-    [OPPONENT_ANDY] =
+    [TRAINER_ANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Andy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andy }
     },
 
-    [OPPONENT_BERNIE_1] =
+    [TRAINER_BERNIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 }
     },
 
-    [OPPONENT_BERNIE_2] =
+    [TRAINER_BERNIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 }
     },
 
-    [OPPONENT_BERNIE_3] =
+    [TRAINER_BERNIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 }
     },
 
-    [OPPONENT_BERNIE_4] =
+    [TRAINER_BERNIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 }
     },
 
-    [OPPONENT_BERNIE_5] =
+    [TRAINER_BERNIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 }
     },
 
-    [OPPONENT_DREW] =
+    [TRAINER_DREW] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Drew
+        .party = {.NoItemCustomMoves = gTrainerParty_Drew }
     },
 
-    [OPPONENT_CLIFF] =
+    [TRAINER_CLIFF] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cliff
+        .party = {.NoItemCustomMoves = gTrainerParty_Cliff }
     },
 
-    [OPPONENT_LARRY] =
+    [TRAINER_LARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Larry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Larry }
     },
 
-    [OPPONENT_SHANE] =
+    [TRAINER_SHANE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Shane
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shane }
     },
 
-    [OPPONENT_JUSTIN] =
+    [TRAINER_JUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Justin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Justin }
     },
 
-    [OPPONENT_ETHAN_1] =
+    [TRAINER_ETHAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 }
     },
 
-    [OPPONENT_JEFF] =
+    [TRAINER_JEFF] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jeff
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jeff }
     },
 
-    [OPPONENT_TRAVIS] =
+    [TRAINER_TRAVIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Travis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Travis }
     },
 
-    [OPPONENT_ETHAN_2] =
+    [TRAINER_ETHAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 }
     },
 
-    [OPPONENT_ETHAN_3] =
+    [TRAINER_ETHAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 }
     },
 
-    [OPPONENT_ETHAN_4] =
+    [TRAINER_ETHAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 }
     },
 
-    [OPPONENT_ETHAN_5] =
+    [TRAINER_ETHAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 }
     },
 
-    [OPPONENT_BRENT] =
+    [TRAINER_BRENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brent }
     },
 
-    [OPPONENT_DONALD] =
+    [TRAINER_DONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Donald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donald }
     },
 
-    [OPPONENT_TAYLOR] =
+    [TRAINER_TAYLOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Taylor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Taylor }
     },
 
-    [OPPONENT_BRANDON_1] =
+    [TRAINER_BRANDON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 }
     },
 
-    [OPPONENT_DEREK] =
+    [TRAINER_DEREK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Derek
+        .party = {.NoItemDefaultMoves = gTrainerParty_Derek }
     },
 
-    [OPPONENT_BRANDON_2] =
+    [TRAINER_BRANDON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 }
     },
 
-    [OPPONENT_BRANDON_3] =
+    [TRAINER_BRANDON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 }
     },
 
-    [OPPONENT_BRANDON_4] =
+    [TRAINER_BRANDON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Brandon4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 }
     },
 
-    [OPPONENT_BRANDON_5] =
+    [TRAINER_BRANDON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 5,
-        .party = gTrainerParty_Brandon5
+        .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 }
     },
 
-    [OPPONENT_EDWARD] =
+    [TRAINER_EDWARD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Edward
+        .party = {.NoItemCustomMoves = gTrainerParty_Edward }
     },
 
-    [OPPONENT_PRESTON] =
+    [TRAINER_PRESTON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Preston
+        .party = {.NoItemDefaultMoves = gTrainerParty_Preston }
     },
 
-    [OPPONENT_VIRGIL] =
+    [TRAINER_VIRGIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Virgil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Virgil }
     },
 
-    [OPPONENT_FRITZ] =
+    [TRAINER_FRITZ] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Fritz
+        .party = {.NoItemDefaultMoves = gTrainerParty_Fritz }
     },
 
-    [OPPONENT_WILLIAM] =
+    [TRAINER_WILLIAM] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_William
+        .party = {.NoItemDefaultMoves = gTrainerParty_William }
     },
 
-    [OPPONENT_JOSHUA] =
+    [TRAINER_JOSHUA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joshua
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joshua }
     },
 
-    [OPPONENT_CAMERON_1] =
+    [TRAINER_CAMERON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 }
     },
 
-    [OPPONENT_CAMERON_2] =
+    [TRAINER_CAMERON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 }
     },
 
-    [OPPONENT_CAMERON_3] =
+    [TRAINER_CAMERON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 }
     },
 
-    [OPPONENT_CAMERON_4] =
+    [TRAINER_CAMERON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 }
     },
 
-    [OPPONENT_CAMERON_5] =
+    [TRAINER_CAMERON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 }
     },
 
-    [OPPONENT_JACLYN] =
+    [TRAINER_JACLYN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jaclyn
+        .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn }
     },
 
-    [OPPONENT_HANNAH] =
+    [TRAINER_HANNAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hannah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hannah }
     },
 
-    [OPPONENT_SAMANTHA] =
+    [TRAINER_SAMANTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Samantha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samantha }
     },
 
-    [OPPONENT_MAURA] =
+    [TRAINER_MAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Maura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maura }
     },
 
-    [OPPONENT_KAYLA] =
+    [TRAINER_KAYLA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kayla
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kayla }
     },
 
-    [OPPONENT_ALEXIS] =
+    [TRAINER_ALEXIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alexis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexis }
     },
 
-    [OPPONENT_JACKI_1] =
+    [TRAINER_JACKI_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 }
     },
 
-    [OPPONENT_JACKI_2] =
+    [TRAINER_JACKI_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 }
     },
 
-    [OPPONENT_JACKI_3] =
+    [TRAINER_JACKI_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 }
     },
 
-    [OPPONENT_JACKI_4] =
+    [TRAINER_JACKI_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 }
     },
 
-    [OPPONENT_JACKI_5] =
+    [TRAINER_JACKI_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 }
     },
 
-    [OPPONENT_WALTER_1] =
+    [TRAINER_WALTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 }
     },
 
-    [OPPONENT_TUCKER] =
+    [TRAINER_TUCKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tucker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tucker }
     },
 
-    [OPPONENT_THOMAS] =
+    [TRAINER_THOMAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Thomas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Thomas }
     },
 
-    [OPPONENT_WALTER_2] =
+    [TRAINER_WALTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 }
     },
 
-    [OPPONENT_WALTER_3] =
+    [TRAINER_WALTER_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter3
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter3 }
     },
 
-    [OPPONENT_WALTER_4] =
+    [TRAINER_WALTER_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter4
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter4 }
     },
 
-    [OPPONENT_WALTER_5] =
+    [TRAINER_WALTER_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Walter5
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter5 }
     },
 
-    [OPPONENT_SIDNEY] =
+    [TRAINER_SIDNEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Sidney
+        .party = {.ItemCustomMoves = gTrainerParty_Sidney }
     },
 
-    [OPPONENT_PHOEBE] =
+    [TRAINER_PHOEBE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Phoebe
+        .party = {.ItemCustomMoves = gTrainerParty_Phoebe }
     },
 
-    [OPPONENT_GLACIA] =
+    [TRAINER_GLACIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Glacia
+        .party = {.ItemCustomMoves = gTrainerParty_Glacia }
     },
 
-    [OPPONENT_DRAKE] =
+    [TRAINER_DRAKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Drake
+        .party = {.ItemCustomMoves = gTrainerParty_Drake }
     },
 
-    [OPPONENT_ROXANNE] =
+    [TRAINER_ROXANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Roxanne
+        .party = {.NoItemCustomMoves = gTrainerParty_Roxanne }
     },
 
-    [OPPONENT_BRAWLY] =
+    [TRAINER_BRAWLY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Brawly
+        .party = {.NoItemCustomMoves = gTrainerParty_Brawly }
     },
 
-    [OPPONENT_WATTSON] =
+    [TRAINER_WATTSON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wattson
+        .party = {.NoItemCustomMoves = gTrainerParty_Wattson }
     },
 
-    [OPPONENT_FLANNERY] =
+    [TRAINER_FLANNERY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Flannery
+        .party = {.NoItemCustomMoves = gTrainerParty_Flannery }
     },
 
-    [OPPONENT_NORMAN] =
+    [TRAINER_NORMAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Norman
+        .party = {.NoItemCustomMoves = gTrainerParty_Norman }
     },
 
-    [OPPONENT_WINONA] =
+    [TRAINER_WINONA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Winona
+        .party = {.NoItemCustomMoves = gTrainerParty_Winona }
     },
 
-    [OPPONENT_TATE_AND_LIZA] =
+    [TRAINER_TATE_AND_LIZA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_TateAndLiza
+        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza }
     },
 
-    [OPPONENT_WALLACE] =
+    [TRAINER_WALLACE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wallace
+        .party = {.NoItemCustomMoves = gTrainerParty_Wallace }
     },
 
-    [OPPONENT_JERRY_1] =
+    [TRAINER_JERRY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jerry1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 }
     },
 
-    [OPPONENT_TED] =
+    [TRAINER_TED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ted
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ted }
     },
 
-    [OPPONENT_PAUL] =
+    [TRAINER_PAUL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Paul
+        .party = {.NoItemDefaultMoves = gTrainerParty_Paul }
     },
 
-    [OPPONENT_JERRY_2] =
+    [TRAINER_JERRY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 }
     },
 
-    [OPPONENT_JERRY_3] =
+    [TRAINER_JERRY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 }
     },
 
-    [OPPONENT_JERRY_4] =
+    [TRAINER_JERRY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 }
     },
 
-    [OPPONENT_JERRY_5] =
+    [TRAINER_JERRY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jerry5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 }
     },
 
-    [OPPONENT_KAREN_1] =
+    [TRAINER_KAREN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 }
     },
 
-    [OPPONENT_GEORGIA] =
+    [TRAINER_GEORGIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Georgia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Georgia }
     },
 
-    [OPPONENT_KAREN_2] =
+    [TRAINER_KAREN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 }
     },
 
-    [OPPONENT_KAREN_3] =
+    [TRAINER_KAREN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 }
     },
 
-    [OPPONENT_KAREN_4] =
+    [TRAINER_KAREN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 }
     },
 
-    [OPPONENT_KAREN_5] =
+    [TRAINER_KAREN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 }
     },
 
-    [OPPONENT_KATE_AND_JOY] =
+    [TRAINER_KATE_AND_JOY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KateAndJoy
+        .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy }
     },
 
-    [OPPONENT_ANNA_AND_MEG_1] =
+    [TRAINER_ANNA_AND_MEG_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg1
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_2] =
+    [TRAINER_ANNA_AND_MEG_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg2
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_3] =
+    [TRAINER_ANNA_AND_MEG_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg3
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_4] =
+    [TRAINER_ANNA_AND_MEG_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg4
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_5] =
+    [TRAINER_ANNA_AND_MEG_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg5
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 }
     },
 
-    [OPPONENT_VICTOR] =
+    [TRAINER_VICTOR] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Victor
+        .party = {.ItemDefaultMoves = gTrainerParty_Victor }
     },
 
-    [OPPONENT_MIGUEL_1] =
+    [TRAINER_MIGUEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 }
     },
 
-    [OPPONENT_COLTON] =
+    [TRAINER_COLTON] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Colton
+        .party = {.ItemCustomMoves = gTrainerParty_Colton }
     },
 
-    [OPPONENT_MIGUEL_2] =
+    [TRAINER_MIGUEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 }
     },
 
-    [OPPONENT_MIGUEL_3] =
+    [TRAINER_MIGUEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 }
     },
 
-    [OPPONENT_MIGUEL_4] =
+    [TRAINER_MIGUEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 }
     },
 
-    [OPPONENT_MIGUEL_5] =
+    [TRAINER_MIGUEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 }
     },
 
-    [OPPONENT_VICTORIA] =
+    [TRAINER_VICTORIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Victoria
+        .party = {.ItemDefaultMoves = gTrainerParty_Victoria }
     },
 
-    [OPPONENT_VANESSA] =
+    [TRAINER_VANESSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vanessa
+        .party = {.ItemDefaultMoves = gTrainerParty_Vanessa }
     },
 
-    [OPPONENT_MARISSA] =
+    [TRAINER_MARISSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Marissa
+        .party = {.ItemDefaultMoves = gTrainerParty_Marissa }
     },
 
-    [OPPONENT_ISABEL_1] =
+    [TRAINER_ISABEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 }
     },
 
-    [OPPONENT_ISABEL_2] =
+    [TRAINER_ISABEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 }
     },
 
-    [OPPONENT_ISABEL_3] =
+    [TRAINER_ISABEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 }
     },
 
-    [OPPONENT_ISABEL_4] =
+    [TRAINER_ISABEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 }
     },
 
-    [OPPONENT_ISABEL_5] =
+    [TRAINER_ISABEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 }
     },
 
-    [OPPONENT_TIMOTHY_1] =
+    [TRAINER_TIMOTHY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 }
     },
 
-    [OPPONENT_TIMOTHY_2] =
+    [TRAINER_TIMOTHY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 }
     },
 
-    [OPPONENT_TIMOTHY_3] =
+    [TRAINER_TIMOTHY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy3
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 }
     },
 
-    [OPPONENT_TIMOTHY_4] =
+    [TRAINER_TIMOTHY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy4
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 }
     },
 
-    [OPPONENT_TIMOTHY_5] =
+    [TRAINER_TIMOTHY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy5
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 }
     },
 
-    [OPPONENT_VICKY] =
+    [TRAINER_VICKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Vicky
+        .party = {.NoItemCustomMoves = gTrainerParty_Vicky }
     },
 
-    [OPPONENT_SHELBY_1] =
+    [TRAINER_SHELBY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 }
     },
 
-    [OPPONENT_SHELBY_2] =
+    [TRAINER_SHELBY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 }
     },
 
-    [OPPONENT_SHELBY_3] =
+    [TRAINER_SHELBY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 }
     },
 
-    [OPPONENT_SHELBY_4] =
+    [TRAINER_SHELBY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 }
     },
 
-    [OPPONENT_SHELBY_5] =
+    [TRAINER_SHELBY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 }
     },
 
-    [OPPONENT_CALVIN_1] =
+    [TRAINER_CALVIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 }
     },
 
-    [OPPONENT_BILLY] =
+    [TRAINER_BILLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Billy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Billy }
     },
 
-    [OPPONENT_JOSH] =
+    [TRAINER_JOSH] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Josh
+        .party = {.NoItemCustomMoves = gTrainerParty_Josh }
     },
 
-    [OPPONENT_TOMMY] =
+    [TRAINER_TOMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tommy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tommy }
     },
 
-    [OPPONENT_JOEY] =
+    [TRAINER_JOEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joey }
     },
 
-    [OPPONENT_BEN] =
+    [TRAINER_BEN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ben
+        .party = {.NoItemCustomMoves = gTrainerParty_Ben }
     },
 
-    [OPPONENT_ANONYMOUS_5] =
+    [TRAINER_ANONYMOUS_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 }
     },
 
-    [OPPONENT_KEVIN] =
+    [TRAINER_KEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kevin }
     },
 
-    [OPPONENT_NEAL] =
+    [TRAINER_NEAL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Neal
+        .party = {.NoItemDefaultMoves = gTrainerParty_Neal }
     },
 
-    [OPPONENT_DILLON] =
+    [TRAINER_DILLON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dillon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dillon }
     },
 
-    [OPPONENT_CALVIN_2] =
+    [TRAINER_CALVIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 }
     },
 
-    [OPPONENT_CALVIN_3] =
+    [TRAINER_CALVIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 }
     },
 
-    [OPPONENT_CALVIN_4] =
+    [TRAINER_CALVIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 }
     },
 
-    [OPPONENT_CALVIN_5] =
+    [TRAINER_CALVIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Calvin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 }
     },
 
-    [OPPONENT_EDDIE] =
+    [TRAINER_EDDIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eddie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eddie }
     },
 
-    [OPPONENT_ALLEN] =
+    [TRAINER_ALLEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Allen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allen }
     },
 
-    [OPPONENT_TIMMY] =
+    [TRAINER_TIMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Timmy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timmy }
     },
 
-    [OPPONENT_STEVEN] =
+    [TRAINER_STEVEN] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 6,
-        .party = gTrainerParty_Steven
+        .party = {.ItemCustomMoves = gTrainerParty_Steven }
     },
 
-    [OPPONENT_ANDREW] =
+    [TRAINER_ANDREW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Andrew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrew }
     },
 
-    [OPPONENT_IVAN] =
+    [TRAINER_IVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ivan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ivan }
     },
 
-    [OPPONENT_CLAUDE] =
+    [TRAINER_CLAUDE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Claude
+        .party = {.NoItemDefaultMoves = gTrainerParty_Claude }
     },
 
-    [OPPONENT_ELLIOT_1] =
+    [TRAINER_ELLIOT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 }
     },
 
-    [OPPONENT_NED] =
+    [TRAINER_NED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ned
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ned }
     },
 
-    [OPPONENT_DALE] =
+    [TRAINER_DALE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Dale
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dale }
     },
 
-    [OPPONENT_NOLAN] =
+    [TRAINER_NOLAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nolan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nolan }
     },
 
-    [OPPONENT_BARNY] =
+    [TRAINER_BARNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Barny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barny }
     },
 
-    [OPPONENT_WADE] =
+    [TRAINER_WADE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Wade
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wade }
     },
 
-    [OPPONENT_CARTER] =
+    [TRAINER_CARTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Carter
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carter }
     },
 
-    [OPPONENT_ELLIOT_2] =
+    [TRAINER_ELLIOT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 }
     },
 
-    [OPPONENT_ELLIOT_3] =
+    [TRAINER_ELLIOT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 }
     },
 
-    [OPPONENT_ELLIOT_4] =
+    [TRAINER_ELLIOT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 }
     },
 
-    [OPPONENT_ELLIOT_5] =
+    [TRAINER_ELLIOT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 4,
-        .party = gTrainerParty_Elliot5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 }
     },
 
-    [OPPONENT_RONALD] =
+    [TRAINER_RONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Ronald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ronald }
     },
 
-    [OPPONENT_JACOB] =
+    [TRAINER_JACOB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jacob
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacob }
     },
 
-    [OPPONENT_ANTHONY] =
+    [TRAINER_ANTHONY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anthony
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anthony }
     },
 
-    [OPPONENT_BENJAMIN_1] =
+    [TRAINER_BENJAMIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 }
     },
 
-    [OPPONENT_BENJAMIN_2] =
+    [TRAINER_BENJAMIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 }
     },
 
-    [OPPONENT_BENJAMIN_3] =
+    [TRAINER_BENJAMIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 }
     },
 
-    [OPPONENT_BENJAMIN_4] =
+    [TRAINER_BENJAMIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 }
     },
 
-    [OPPONENT_BENJAMIN_5] =
+    [TRAINER_BENJAMIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 }
     },
 
-    [OPPONENT_ABIGAIL_1] =
+    [TRAINER_ABIGAIL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 }
     },
 
-    [OPPONENT_JASMINE] =
+    [TRAINER_JASMINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jasmine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine }
     },
 
-    [OPPONENT_ABIGAIL_2] =
+    [TRAINER_ABIGAIL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 }
     },
 
-    [OPPONENT_ABIGAIL_3] =
+    [TRAINER_ABIGAIL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 }
     },
 
-    [OPPONENT_ABIGAIL_4] =
+    [TRAINER_ABIGAIL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 }
     },
 
-    [OPPONENT_ABIGAIL_5] =
+    [TRAINER_ABIGAIL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 }
     },
 
-    [OPPONENT_DYLAN_1] =
+    [TRAINER_DYLAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 }
     },
 
-    [OPPONENT_DYLAN_2] =
+    [TRAINER_DYLAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 }
     },
 
-    [OPPONENT_DYLAN_3] =
+    [TRAINER_DYLAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 }
     },
 
-    [OPPONENT_DYLAN_4] =
+    [TRAINER_DYLAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 }
     },
 
-    [OPPONENT_DYLAN_5] =
+    [TRAINER_DYLAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 }
     },
 
-    [OPPONENT_MARIA_1] =
+    [TRAINER_MARIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 }
     },
 
-    [OPPONENT_MARIA_2] =
+    [TRAINER_MARIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 }
     },
 
-    [OPPONENT_MARIA_3] =
+    [TRAINER_MARIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 }
     },
 
-    [OPPONENT_MARIA_4] =
+    [TRAINER_MARIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 }
     },
 
-    [OPPONENT_MARIA_5] =
+    [TRAINER_MARIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 }
     },
 
-    [OPPONENT_CALEB] =
+    [TRAINER_CALEB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Caleb
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caleb }
     },
 
-    [OPPONENT_ANONYMOUS_6] =
+    [TRAINER_ANONYMOUS_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 }
     },
 
-    [OPPONENT_ISAIAH_1] =
+    [TRAINER_ISAIAH_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 }
     },
 
-    [OPPONENT_ANONYMOUS_7] =
+    [TRAINER_ANONYMOUS_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 }
     },
 
-    [OPPONENT_CHASE] =
+    [TRAINER_CHASE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chase
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chase }
     },
 
-    [OPPONENT_ISAIAH_2] =
+    [TRAINER_ISAIAH_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 }
     },
 
-    [OPPONENT_ISAIAH_3] =
+    [TRAINER_ISAIAH_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 }
     },
 
-    [OPPONENT_ISAIAH_4] =
+    [TRAINER_ISAIAH_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 }
     },
 
-    [OPPONENT_ISAIAH_5] =
+    [TRAINER_ISAIAH_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 }
     },
 
-    [OPPONENT_ANONYMOUS_8] =
+    [TRAINER_ANONYMOUS_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 }
     },
 
-    [OPPONENT_CONNOR] =
+    [TRAINER_CONNOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Connor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connor }
     },
 
-    [OPPONENT_ANONYMOUS_9] =
+    [TRAINER_ANONYMOUS_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 }
     },
 
-    [OPPONENT_KATELYN_1] =
+    [TRAINER_KATELYN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 }
     },
 
-    [OPPONENT_ALLISON] =
+    [TRAINER_ALLISON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Allison
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allison }
     },
 
-    [OPPONENT_KATELYN_2] =
+    [TRAINER_KATELYN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 }
     },
 
-    [OPPONENT_KATELYN_3] =
+    [TRAINER_KATELYN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 }
     },
 
-    [OPPONENT_KATELYN_4] =
+    [TRAINER_KATELYN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 }
     },
 
-    [OPPONENT_KATELYN_5] =
+    [TRAINER_KATELYN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 }
     },
 
-    [OPPONENT_NICOLAS_1] =
+    [TRAINER_NICOLAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 }
     },
 
-    [OPPONENT_NICOLAS_2] =
+    [TRAINER_NICOLAS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 }
     },
 
-    [OPPONENT_NICOLAS_3] =
+    [TRAINER_NICOLAS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 }
     },
 
-    [OPPONENT_NICOLAS_4] =
+    [TRAINER_NICOLAS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 }
     },
 
-    [OPPONENT_NICOLAS_5] =
+    [TRAINER_NICOLAS_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 }
     },
 
-    [OPPONENT_AARON] =
+    [TRAINER_AARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Aaron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aaron }
     },
 
-    [OPPONENT_PERRY] =
+    [TRAINER_PERRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Perry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Perry }
     },
 
-    [OPPONENT_HUGH] =
+    [TRAINER_HUGH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hugh
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hugh }
     },
 
-    [OPPONENT_PHIL] =
+    [TRAINER_PHIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Phil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phil }
     },
 
-    [OPPONENT_JARED] =
+    [TRAINER_JARED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jared
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jared }
     },
 
-    [OPPONENT_ANONYMOUS_10] =
+    [TRAINER_ANONYMOUS_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Anonymous10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 }
     },
 
-    [OPPONENT_TANNER] =
+    [TRAINER_TANNER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tanner
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanner }
     },
 
-    [OPPONENT_WILL] =
+    [TRAINER_WILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Will
+        .party = {.NoItemDefaultMoves = gTrainerParty_Will }
     },
 
-    [OPPONENT_COLIN] =
+    [TRAINER_COLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Colin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Colin }
     },
 
-    [OPPONENT_ROBERT_1] =
+    [TRAINER_ROBERT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Robert1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 }
     },
 
-    [OPPONENT_BENNY] =
+    [TRAINER_BENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Benny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benny }
     },
 
-    [OPPONENT_CHESTER] =
+    [TRAINER_CHESTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chester
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chester }
     },
 
-    [OPPONENT_ROBERT_2] =
+    [TRAINER_ROBERT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 }
     },
 
-    [OPPONENT_ROBERT_3] =
+    [TRAINER_ROBERT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 }
     },
 
-    [OPPONENT_ROBERT_4] =
+    [TRAINER_ROBERT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 }
     },
 
-    [OPPONENT_ROBERT_5] =
+    [TRAINER_ROBERT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 }
     },
 
-    [OPPONENT_ALEX] =
+    [TRAINER_ALEX] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Alex
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alex }
     },
 
-    [OPPONENT_BECK] =
+    [TRAINER_BECK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beck
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beck }
     },
 
-    [OPPONENT_YASU] =
+    [TRAINER_YASU] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Yasu
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yasu }
     },
 
-    [OPPONENT_TAKASHI] =
+    [TRAINER_TAKASHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Takashi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Takashi }
     },
 
-    [OPPONENT_MAKOTO] =
+    [TRAINER_MAKOTO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 1,
-        .party = gTrainerParty_Makoto
+        .party = {.NoItemDefaultMoves = gTrainerParty_Makoto }
     },
 
-    [OPPONENT_HIDEO_1] =
+    [TRAINER_HIDEO_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Hideo1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 }
     },
 
-    [OPPONENT_LAO_1] =
+    [TRAINER_LAO_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao1
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao1 }
     },
 
-    [OPPONENT_LUNG] =
+    [TRAINER_LUNG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 2,
-        .party = gTrainerParty_Lung
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lung }
     },
 
-    [OPPONENT_LAO_2] =
+    [TRAINER_LAO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao2 }
     },
 
-    [OPPONENT_LAO_3] =
+    [TRAINER_LAO_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao3
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao3 }
     },
 
-    [OPPONENT_LAO_4] =
+    [TRAINER_LAO_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao4
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao4 }
     },
 
-    [OPPONENT_LAO_5] =
+    [TRAINER_LAO_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao5
+        .party = {.ItemCustomMoves = gTrainerParty_Lao5 }
     },
 
-    [OPPONENT_TESSA] =
+    [TRAINER_TESSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tessa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tessa }
     },
 
-    [OPPONENT_LAURA] =
+    [TRAINER_LAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Laura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laura }
     },
 
-    [OPPONENT_CYNDY_1] =
+    [TRAINER_CYNDY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 }
     },
 
-    [OPPONENT_CORA] =
+    [TRAINER_CORA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cora
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cora }
     },
 
-    [OPPONENT_JILL] =
+    [TRAINER_JILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jill
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jill }
     },
 
-    [OPPONENT_CYNDY_2] =
+    [TRAINER_CYNDY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 }
     },
 
-    [OPPONENT_CYNDY_3] =
+    [TRAINER_CYNDY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 }
     },
 
-    [OPPONENT_CYNDY_4] =
+    [TRAINER_CYNDY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 }
     },
 
-    [OPPONENT_CYNDY_5] =
+    [TRAINER_CYNDY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 }
     },
 
-    [OPPONENT_MADELINE_1] =
+    [TRAINER_MADELINE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline1
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 }
     },
 
-    [OPPONENT_CLARISSA] =
+    [TRAINER_CLARISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Clarissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa }
     },
 
-    [OPPONENT_ANGELICA] =
+    [TRAINER_ANGELICA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Angelica
+        .party = {.NoItemDefaultMoves = gTrainerParty_Angelica }
     },
 
-    [OPPONENT_MADELINE_2] =
+    [TRAINER_MADELINE_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline2
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 }
     },
 
-    [OPPONENT_MADELINE_3] =
+    [TRAINER_MADELINE_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline3
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 }
     },
 
-    [OPPONENT_MADELINE_4] =
+    [TRAINER_MADELINE_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline4
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 }
     },
 
-    [OPPONENT_MADELINE_5] =
+    [TRAINER_MADELINE_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline5
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 }
     },
 
-    [OPPONENT_BEVERLY] =
+    [TRAINER_BEVERLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beverly
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beverly }
     },
 
-    [OPPONENT_DAWN] =
+    [TRAINER_DAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dawn }
     },
 
-    [OPPONENT_NICOLE] =
+    [TRAINER_NICOLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nicole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicole }
     },
 
-    [OPPONENT_DENISE] =
+    [TRAINER_DENISE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Denise
+        .party = {.NoItemDefaultMoves = gTrainerParty_Denise }
     },
 
-    [OPPONENT_BETH] =
+    [TRAINER_BETH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Beth
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beth }
     },
 
-    [OPPONENT_TARA] =
+    [TRAINER_TARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tara }
     },
 
-    [OPPONENT_MISSY] =
+    [TRAINER_MISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Missy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Missy }
     },
 
-    [OPPONENT_ALICE] =
+    [TRAINER_ALICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alice }
     },
 
-    [OPPONENT_JENNY_1] =
+    [TRAINER_JENNY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 }
     },
 
-    [OPPONENT_GRACE] =
+    [TRAINER_GRACE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grace
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grace }
     },
 
-    [OPPONENT_TANYA] =
+    [TRAINER_TANYA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tanya
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanya }
     },
 
-    [OPPONENT_SHARON] =
+    [TRAINER_SHARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Sharon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sharon }
     },
 
-    [OPPONENT_NIKKI] =
+    [TRAINER_NIKKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nikki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nikki }
     },
 
-    [OPPONENT_BRENDA] =
+    [TRAINER_BRENDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brenda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brenda }
     },
 
-    [OPPONENT_KATIE] =
+    [TRAINER_KATIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Katie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katie }
     },
 
-    [OPPONENT_SUSIE] =
+    [TRAINER_SUSIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Susie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Susie }
     },
 
-    [OPPONENT_KARA] =
+    [TRAINER_KARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kara }
     },
 
-    [OPPONENT_DANA] =
+    [TRAINER_DANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dana }
     },
 
-    [OPPONENT_ERIN] =
+    [TRAINER_ERIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Erin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Erin }
     },
 
-    [OPPONENT_DEBRA] =
+    [TRAINER_DEBRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Debra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Debra }
     },
 
-    [OPPONENT_LINDA] =
+    [TRAINER_LINDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Linda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Linda }
     },
 
-    [OPPONENT_KAYLEE] =
+    [TRAINER_KAYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kaylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee }
     },
 
-    [OPPONENT_LAUREL] =
+    [TRAINER_LAUREL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Laurel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laurel }
     },
 
-    [OPPONENT_DARCY] =
+    [TRAINER_DARCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darcy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darcy }
     },
 
-    [OPPONENT_JENNY_2] =
+    [TRAINER_JENNY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 }
     },
 
-    [OPPONENT_JENNY_3] =
+    [TRAINER_JENNY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 }
     },
 
-    [OPPONENT_JENNY_4] =
+    [TRAINER_JENNY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jenny4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 }
     },
 
-    [OPPONENT_JENNY_5] =
+    [TRAINER_JENNY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jenny5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 }
     },
 
-    [OPPONENT_HEIDI] =
+    [TRAINER_HEIDI] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Heidi
+        .party = {.NoItemCustomMoves = gTrainerParty_Heidi }
     },
 
-    [OPPONENT_BECKY] =
+    [TRAINER_BECKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Becky
+        .party = {.NoItemCustomMoves = gTrainerParty_Becky }
     },
 
-    [OPPONENT_CAROL] =
+    [TRAINER_CAROL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Carol
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carol }
     },
 
-    [OPPONENT_NANCY] =
+    [TRAINER_NANCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nancy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nancy }
     },
 
-    [OPPONENT_MARTHA] =
+    [TRAINER_MARTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Martha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Martha }
     },
 
-    [OPPONENT_DIANA_1] =
+    [TRAINER_DIANA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 }
     },
 
-    [OPPONENT_NINA] =
+    [TRAINER_NINA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nina
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nina }
     },
 
-    [OPPONENT_IRENE] =
+    [TRAINER_IRENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Irene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Irene }
     },
 
-    [OPPONENT_DIANA_2] =
+    [TRAINER_DIANA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 }
     },
 
-    [OPPONENT_DIANA_3] =
+    [TRAINER_DIANA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 }
     },
 
-    [OPPONENT_DIANA_4] =
+    [TRAINER_DIANA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 }
     },
 
-    [OPPONENT_DIANA_5] =
+    [TRAINER_DIANA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_1] =
+    [TRAINER_AMY_AND_LIV_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv1
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 }
     },
 
-    [OPPONENT_AMY_AND_LIV_2] =
+    [TRAINER_AMY_AND_LIV_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv2
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 }
     },
 
-    [OPPONENT_GINA_AND_MIA_1] =
+    [TRAINER_GINA_AND_MIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 }
     },
 
-    [OPPONENT_MIU_AND_YUKI] =
+    [TRAINER_MIU_AND_YUKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MiuAndYuki
+        .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki }
     },
 
-    [OPPONENT_AMY_AND_LIV_3] =
+    [TRAINER_AMY_AND_LIV_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv3
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 }
     },
 
-    [OPPONENT_GINA_AND_MIA_2] =
+    [TRAINER_GINA_AND_MIA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia2
+        .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 }
     },
 
-    [OPPONENT_AMY_AND_LIV_4] =
+    [TRAINER_AMY_AND_LIV_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv4
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 }
     },
 
-    [OPPONENT_AMY_AND_LIV_5] =
+    [TRAINER_AMY_AND_LIV_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv5
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_6] =
+    [TRAINER_AMY_AND_LIV_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv6
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 }
     },
 
-    [OPPONENT_HUEY] =
+    [TRAINER_HUEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Huey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Huey }
     },
 
-    [OPPONENT_EDMOND] =
+    [TRAINER_EDMOND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Edmond
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edmond }
     },
 
-    [OPPONENT_ERNEST_1] =
+    [TRAINER_ERNEST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 }
     },
 
-    [OPPONENT_DWAYNE] =
+    [TRAINER_DWAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dwayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne }
     },
 
-    [OPPONENT_PHILLIP] =
+    [TRAINER_PHILLIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Phillip
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phillip }
     },
 
-    [OPPONENT_LEONARD] =
+    [TRAINER_LEONARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Leonard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leonard }
     },
 
-    [OPPONENT_DUNCAN] =
+    [TRAINER_DUNCAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Duncan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Duncan }
     },
 
-    [OPPONENT_ERNEST_2] =
+    [TRAINER_ERNEST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 }
     },
 
-    [OPPONENT_ERNEST_3] =
+    [TRAINER_ERNEST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 }
     },
 
-    [OPPONENT_ERNEST_4] =
+    [TRAINER_ERNEST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 }
     },
 
-    [OPPONENT_ERNEST_5] =
+    [TRAINER_ERNEST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 }
     },
 
-    [OPPONENT_ANONYMOUS_11] =
+    [TRAINER_ANONYMOUS_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 }
     },
 
-    [OPPONENT_ANONYMOUS_12] =
+    [TRAINER_ANONYMOUS_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 }
     },
 
-    [OPPONENT_ANONYMOUS_13] =
+    [TRAINER_ANONYMOUS_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 }
     },
 
-    [OPPONENT_SONNY] =
+    [TRAINER_SONNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sonny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sonny }
     },
 
-    [OPPONENT_DONOVAN] =
+    [TRAINER_DONOVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Donovan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donovan }
     },
 
-    [OPPONENT_GERALD] =
+    [TRAINER_GERALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Gerald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gerald }
     },
 
-    [OPPONENT_KELVIN] =
+    [TRAINER_KELVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kelvin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin }
     },
 
-    [OPPONENT_KODY] =
+    [TRAINER_KODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kody }
     },
 
-    [OPPONENT_TEVIN] =
+    [TRAINER_TEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tevin }
     },
 
-    [OPPONENT_DAMON] =
+    [TRAINER_DAMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Damon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Damon }
     },
 
-    [OPPONENT_PABLO] =
+    [TRAINER_PABLO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Pablo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo }
     },
 
-    [OPPONENT_EDWIN_1] =
+    [TRAINER_EDWIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 }
     },
 
-    [OPPONENT_HECTOR_1] =
+    [TRAINER_HECTOR_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 }
     },
 
-    [OPPONENT_HECTOR_2] =
+    [TRAINER_HECTOR_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 }
     },
 
-    [OPPONENT_EDWIN_2] =
+    [TRAINER_EDWIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 }
     },
 
-    [OPPONENT_EDWIN_3] =
+    [TRAINER_EDWIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 }
     },
 
-    [OPPONENT_EDWIN_4] =
+    [TRAINER_EDWIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 }
     },
 
-    [OPPONENT_EDWIN_5] =
+    [TRAINER_EDWIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 }
     },
 
-    [OPPONENT_WALLY_1] =
+    [TRAINER_WALLY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally1
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally1 }
     },
 
-    [OPPONENT_BRENDAN_1] =
+    [TRAINER_BRENDAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 }
     },
 
-    [OPPONENT_BRENDAN_2] =
+    [TRAINER_BRENDAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 }
     },
 
-    [OPPONENT_BRENDAN_3] =
+    [TRAINER_BRENDAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 }
     },
 
-    [OPPONENT_BRENDAN_4] =
+    [TRAINER_BRENDAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Brendan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 }
     },
 
-    [OPPONENT_BRENDAN_5] =
+    [TRAINER_BRENDAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 }
     },
 
-    [OPPONENT_BRENDAN_6] =
+    [TRAINER_BRENDAN_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 }
     },
 
-    [OPPONENT_BRENDAN_7] =
+    [TRAINER_BRENDAN_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 }
     },
 
-    [OPPONENT_BRENDAN_8] =
+    [TRAINER_BRENDAN_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 }
     },
 
-    [OPPONENT_BRENDAN_9] =
+    [TRAINER_BRENDAN_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 }
     },
 
-    [OPPONENT_MAY_1] =
+    [TRAINER_MAY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May1
+        .party = {.NoItemDefaultMoves = gTrainerParty_May1 }
     },
 
-    [OPPONENT_MAY_2] =
+    [TRAINER_MAY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May2
+        .party = {.NoItemDefaultMoves = gTrainerParty_May2 }
     },
 
-    [OPPONENT_MAY_3] =
+    [TRAINER_MAY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May3
+        .party = {.NoItemDefaultMoves = gTrainerParty_May3 }
     },
 
-    [OPPONENT_MAY_4] =
+    [TRAINER_MAY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May4
+        .party = {.NoItemDefaultMoves = gTrainerParty_May4 }
     },
 
-    [OPPONENT_MAY_5] =
+    [TRAINER_MAY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May5
+        .party = {.NoItemDefaultMoves = gTrainerParty_May5 }
     },
 
-    [OPPONENT_MAY_6] =
+    [TRAINER_MAY_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May6
+        .party = {.NoItemDefaultMoves = gTrainerParty_May6 }
     },
 
-    [OPPONENT_MAY_7] =
+    [TRAINER_MAY_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May7
+        .party = {.NoItemDefaultMoves = gTrainerParty_May7 }
     },
 
-    [OPPONENT_MAY_8] =
+    [TRAINER_MAY_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May8
+        .party = {.NoItemDefaultMoves = gTrainerParty_May8 }
     },
 
-    [OPPONENT_MAY_9] =
+    [TRAINER_MAY_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May9
+        .party = {.NoItemDefaultMoves = gTrainerParty_May9 }
     },
 
-    [OPPONENT_ISAAC_1] =
+    [TRAINER_ISAAC_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 }
     },
 
-    [OPPONENT_RILEY] =
+    [TRAINER_RILEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Riley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Riley }
     },
 
-    [OPPONENT_AIDAN] =
+    [TRAINER_AIDAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Aidan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aidan }
     },
 
-    [OPPONENT_ISAAC_2] =
+    [TRAINER_ISAAC_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 }
     },
 
-    [OPPONENT_ISAAC_3] =
+    [TRAINER_ISAAC_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 }
     },
 
-    [OPPONENT_ISAAC_4] =
+    [TRAINER_ISAAC_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 }
     },
 
-    [OPPONENT_ISAAC_5] =
+    [TRAINER_ISAAC_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 }
     },
 
-    [OPPONENT_LYDIA_1] =
+    [TRAINER_LYDIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 }
     },
 
-    [OPPONENT_ALEXIA] =
+    [TRAINER_ALEXIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Alexia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexia }
     },
 
-    [OPPONENT_DANIELLE] =
+    [TRAINER_DANIELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Danielle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danielle }
     },
 
-    [OPPONENT_LYDIA_2] =
+    [TRAINER_LYDIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 }
     },
 
-    [OPPONENT_LYDIA_3] =
+    [TRAINER_LYDIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 }
     },
 
-    [OPPONENT_LYDIA_4] =
+    [TRAINER_LYDIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 }
     },
 
-    [OPPONENT_LYDIA_5] =
+    [TRAINER_LYDIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 }
     },
 
-    [OPPONENT_JACKSON_1] =
+    [TRAINER_JACKSON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 }
     },
 
-    [OPPONENT_CARLOS] =
+    [TRAINER_CARLOS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Carlos
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carlos }
     },
 
-    [OPPONENT_SEBASTIAN] =
+    [TRAINER_SEBASTIAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Sebastian
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian }
     },
 
-    [OPPONENT_JACKSON_2] =
+    [TRAINER_JACKSON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 }
     },
 
-    [OPPONENT_JACKSON_3] =
+    [TRAINER_JACKSON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 }
     },
 
-    [OPPONENT_JACKSON_4] =
+    [TRAINER_JACKSON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 }
     },
 
-    [OPPONENT_JACKSON_5] =
+    [TRAINER_JACKSON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Jackson5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 }
     },
 
-    [OPPONENT_CATHERINE_1] =
+    [TRAINER_CATHERINE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 }
     },
 
-    [OPPONENT_JENNA] =
+    [TRAINER_JENNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Jenna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenna }
     },
 
-    [OPPONENT_SOPHIA] =
+    [TRAINER_SOPHIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Sophia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sophia }
     },
 
-    [OPPONENT_CATHERINE_2] =
+    [TRAINER_CATHERINE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 }
     },
 
-    [OPPONENT_CATHERINE_3] =
+    [TRAINER_CATHERINE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 }
     },
 
-    [OPPONENT_CATHERINE_4] =
+    [TRAINER_CATHERINE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 }
     },
 
-    [OPPONENT_CATHERINE_5] =
+    [TRAINER_CATHERINE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 }
     },
 
-    [OPPONENT_MAXIE_1] =
+    [TRAINER_MAXIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Maxie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 }
     },
 
-    [OPPONENT_GRUNT_28] =
+    [TRAINER_GRUNT_28] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt28
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 }
     },
 
-    [OPPONENT_GRUNT_29] =
+    [TRAINER_GRUNT_29] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt29
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 }
     },
 
-    [OPPONENT_GRUNT_30] =
+    [TRAINER_GRUNT_30] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt30
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 }
     },
 
-    [OPPONENT_GRUNT_31] =
+    [TRAINER_GRUNT_31] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt31
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 }
     },
 
-    [OPPONENT_GRUNT_32] =
+    [TRAINER_GRUNT_32] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt32
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 }
     },
 
-    [OPPONENT_GRUNT_33] =
+    [TRAINER_GRUNT_33] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt33
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 }
     },
 
-    [OPPONENT_GRUNT_34] =
+    [TRAINER_GRUNT_34] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt34
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 }
     },
 
-    [OPPONENT_GRUNT_35] =
+    [TRAINER_GRUNT_35] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt35
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 }
     },
 
-    [OPPONENT_GRUNT_36] =
+    [TRAINER_GRUNT_36] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt36
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 }
     },
 
-    [OPPONENT_GRUNT_37] =
+    [TRAINER_GRUNT_37] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt37
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 }
     },
 
-    [OPPONENT_GRUNT_38] =
+    [TRAINER_GRUNT_38] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt38
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 }
     },
 
-    [OPPONENT_GRUNT_39] =
+    [TRAINER_GRUNT_39] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt39
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 }
     },
 
-    [OPPONENT_GRUNT_40] =
+    [TRAINER_GRUNT_40] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt40
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 }
     },
 
-    [OPPONENT_GRUNT_41] =
+    [TRAINER_GRUNT_41] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt41
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 }
     },
 
-    [OPPONENT_GRUNT_42] =
+    [TRAINER_GRUNT_42] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt42
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 }
     },
 
-    [OPPONENT_GRUNT_43] =
+    [TRAINER_GRUNT_43] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt43
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 }
     },
 
-    [OPPONENT_GRUNT_44] =
+    [TRAINER_GRUNT_44] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt44
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 }
     },
 
-    [OPPONENT_GRUNT_45] =
+    [TRAINER_GRUNT_45] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt45
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 }
     },
 
-    [OPPONENT_GRUNT_46] =
+    [TRAINER_GRUNT_46] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt46
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 }
     },
 
-    [OPPONENT_GRUNT_47] =
+    [TRAINER_GRUNT_47] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt47
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 }
     },
 
-    [OPPONENT_GRUNT_48] =
+    [TRAINER_GRUNT_48] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt48
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 }
     },
 
-    [OPPONENT_GRUNT_49] =
+    [TRAINER_GRUNT_49] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt49
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 }
     },
 
-    [OPPONENT_GRUNT_50] =
+    [TRAINER_GRUNT_50] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt50
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 }
     },
 
-    [OPPONENT_GRUNT_51] =
+    [TRAINER_GRUNT_51] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt51
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 }
     },
 
-    [OPPONENT_GRUNT_52] =
+    [TRAINER_GRUNT_52] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt52
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 }
     },
 
-    [OPPONENT_GRUNT_53] =
+    [TRAINER_GRUNT_53] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt53
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 }
     },
 
-    [OPPONENT_GRUNT_54] =
+    [TRAINER_GRUNT_54] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt54
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 }
     },
 
-    [OPPONENT_ANONYMOUS_14] =
+    [TRAINER_ANONYMOUS_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 }
     },
 
-    [OPPONENT_ANONYMOUS_15] =
+    [TRAINER_ANONYMOUS_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 }
     },
 
-    [OPPONENT_TABITHA_1] =
+    [TRAINER_TABITHA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 }
     },
 
-    [OPPONENT_TABITHA_2] =
+    [TRAINER_TABITHA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 }
     },
 
-    [OPPONENT_ANONYMOUS_16] =
+    [TRAINER_ANONYMOUS_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 }
     },
 
-    [OPPONENT_COURTNEY_1] =
+    [TRAINER_COURTNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Courtney1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 }
     },
 
-    [OPPONENT_COURTNEY_2] =
+    [TRAINER_COURTNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Courtney2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 }
     },
 
-    [OPPONENT_MAXIE_2] =
+    [TRAINER_MAXIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 }
     },
 
-    [OPPONENT_MAXIE_3] =
+    [TRAINER_MAXIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 }
     },
 
-    [OPPONENT_TIANA] =
+    [TRAINER_TIANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tiana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiana }
     },
 
-    [OPPONENT_HALEY_1] =
+    [TRAINER_HALEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 }
     },
 
-    [OPPONENT_JANICE] =
+    [TRAINER_JANICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Janice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Janice }
     },
 
-    [OPPONENT_VIVI] =
+    [TRAINER_VIVI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vivi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vivi }
     },
 
-    [OPPONENT_HALEY_2] =
+    [TRAINER_HALEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 }
     },
 
-    [OPPONENT_HALEY_3] =
+    [TRAINER_HALEY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 }
     },
 
-    [OPPONENT_HALEY_4] =
+    [TRAINER_HALEY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 }
     },
 
-    [OPPONENT_HALEY_5] =
+    [TRAINER_HALEY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Haley5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 }
     },
 
-    [OPPONENT_SALLY] =
+    [TRAINER_SALLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sally
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sally }
     },
 
-    [OPPONENT_ROBIN] =
+    [TRAINER_ROBIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Robin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robin }
     },
 
-    [OPPONENT_ANDREA] =
+    [TRAINER_ANDREA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Andrea
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrea }
     },
 
-    [OPPONENT_CRISSY] =
+    [TRAINER_CRISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Crissy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Crissy }
     },
 
-    [OPPONENT_RICK] =
+    [TRAINER_RICK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rick
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rick }
     },
 
-    [OPPONENT_LYLE] =
+    [TRAINER_LYLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lyle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lyle }
     },
 
-    [OPPONENT_JOSE] =
+    [TRAINER_JOSE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jose
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jose }
     },
 
-    [OPPONENT_DOUG] =
+    [TRAINER_DOUG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Doug
+        .party = {.NoItemDefaultMoves = gTrainerParty_Doug }
     },
 
-    [OPPONENT_GREG] =
+    [TRAINER_GREG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Greg
+        .party = {.NoItemDefaultMoves = gTrainerParty_Greg }
     },
 
-    [OPPONENT_KENT] =
+    [TRAINER_KENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kent }
     },
 
-    [OPPONENT_JAMES_1] =
+    [TRAINER_JAMES_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James1
+        .party = {.NoItemDefaultMoves = gTrainerParty_James1 }
     },
 
-    [OPPONENT_JAMES_2] =
+    [TRAINER_JAMES_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James2
+        .party = {.NoItemDefaultMoves = gTrainerParty_James2 }
     },
 
-    [OPPONENT_JAMES_3] =
+    [TRAINER_JAMES_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_James3
+        .party = {.NoItemDefaultMoves = gTrainerParty_James3 }
     },
 
-    [OPPONENT_JAMES_4] =
+    [TRAINER_JAMES_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_James4
+        .party = {.NoItemDefaultMoves = gTrainerParty_James4 }
     },
 
-    [OPPONENT_JAMES_5] =
+    [TRAINER_JAMES_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_James5
+        .party = {.NoItemDefaultMoves = gTrainerParty_James5 }
     },
 
-    [OPPONENT_BRICE] =
+    [TRAINER_BRICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brice }
     },
 
-    [OPPONENT_TRENT_1] =
+    [TRAINER_TRENT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 }
     },
 
-    [OPPONENT_LENNY] =
+    [TRAINER_LENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lenny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lenny }
     },
 
-    [OPPONENT_LUCAS_1] =
+    [TRAINER_LUCAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Lucas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 }
     },
 
-    [OPPONENT_ALAN] =
+    [TRAINER_ALAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alan }
     },
 
-    [OPPONENT_CLARK] =
+    [TRAINER_CLARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Clark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clark }
     },
 
-    [OPPONENT_ERIC] =
+    [TRAINER_ERIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eric
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eric }
     },
 
-    [OPPONENT_LUCAS_2] =
+    [TRAINER_LUCAS_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Lucas2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 }
     },
 
-    [OPPONENT_MIKE_1] =
+    [TRAINER_MIKE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Mike1
+        .party = {.NoItemCustomMoves = gTrainerParty_Mike1 }
     },
 
-    [OPPONENT_MIKE_2] =
+    [TRAINER_MIKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Mike2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 }
     },
 
-    [OPPONENT_TRENT_2] =
+    [TRAINER_TRENT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 }
     },
 
-    [OPPONENT_TRENT_3] =
+    [TRAINER_TRENT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 }
     },
 
-    [OPPONENT_TRENT_4] =
+    [TRAINER_TRENT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 }
     },
 
-    [OPPONENT_TRENT_5] =
+    [TRAINER_TRENT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 }
     },
 
-    [OPPONENT_DEZ_AND_LUKE] =
+    [TRAINER_DEZ_AND_LUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_DezAndLuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke }
     },
 
-    [OPPONENT_LEA_AND_JED] =
+    [TRAINER_LEA_AND_JED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LeaAndJed
+        .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed }
     },
 
-    [OPPONENT_LOIS_AND_HAL_1] =
+    [TRAINER_LOIS_AND_HAL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal1
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_2] =
+    [TRAINER_LOIS_AND_HAL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal2
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_3] =
+    [TRAINER_LOIS_AND_HAL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal3
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_4] =
+    [TRAINER_LOIS_AND_HAL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal4
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_5] =
+    [TRAINER_LOIS_AND_HAL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal5
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 }
     },
 
-    [OPPONENT_JOHANNA] =
+    [TRAINER_JOHANNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Johanna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Johanna }
     },
 
-    [OPPONENT_ZANE] =
+    [TRAINER_ZANE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Zane
+        .party = {.NoItemCustomMoves = gTrainerParty_Zane }
     },
 
-    [OPPONENT_VIVIAN] =
+    [TRAINER_VIVIAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vivian
+        .party = {.NoItemCustomMoves = gTrainerParty_Vivian }
     },
 
-    [OPPONENT_SADIE] =
+    [TRAINER_SADIE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sadie
+        .party = {.NoItemCustomMoves = gTrainerParty_Sadie }
     },
 
-    [OPPONENT_HIDEO_2] =
+    [TRAINER_HIDEO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Hideo2
+        .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 }
     },
 
-    [OPPONENT_KEIGO] =
+    [TRAINER_KEIGO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Keigo
+        .party = {.NoItemCustomMoves = gTrainerParty_Keigo }
     },
 
-    [OPPONENT_TSUNAO] =
+    [TRAINER_TSUNAO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Tsunao
+        .party = {.NoItemCustomMoves = gTrainerParty_Tsunao }
     },
 
-    [OPPONENT_TERRELL] =
+    [TRAINER_TERRELL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Terrell
+        .party = {.NoItemDefaultMoves = gTrainerParty_Terrell }
     },
 
-    [OPPONENT_KYLEE] =
+    [TRAINER_KYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kylee }
     },
 
-    [OPPONENT_WALLY_2] =
+    [TRAINER_WALLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Wally2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 }
     },
 
-    [OPPONENT_WALLY_3] =
+    [TRAINER_WALLY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally3
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally3 }
     },
 
-    [OPPONENT_WALLY_4] =
+    [TRAINER_WALLY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally4
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally4 }
     },
 
-    [OPPONENT_WALLY_5] =
+    [TRAINER_WALLY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally5
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally5 }
     },
 
-    [OPPONENT_WALLY_6] =
+    [TRAINER_WALLY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally6
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally6 }
     },
 
-    [OPPONENT_BRENDAN_10] =
+    [TRAINER_BRENDAN_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 }
     },
 
-    [OPPONENT_BRENDAN_11] =
+    [TRAINER_BRENDAN_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 }
     },
 
-    [OPPONENT_BRENDAN_12] =
+    [TRAINER_BRENDAN_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 }
     },
 
-    [OPPONENT_MAY_10] =
+    [TRAINER_MAY_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May10
+        .party = {.NoItemDefaultMoves = gTrainerParty_May10 }
     },
 
-    [OPPONENT_MAY_11] =
+    [TRAINER_MAY_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May11
+        .party = {.NoItemDefaultMoves = gTrainerParty_May11 }
     },
 
-    [OPPONENT_MAY_12] =
+    [TRAINER_MAY_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May12
+        .party = {.NoItemDefaultMoves = gTrainerParty_May12 }
     },
 
-    [OPPONENT_JONAH] =
+    [TRAINER_JONAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Jonah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jonah }
     },
 
-    [OPPONENT_HENRY] =
+    [TRAINER_HENRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Henry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Henry }
     },
 
-    [OPPONENT_ROGER] =
+    [TRAINER_ROGER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Roger
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roger }
     },
 
-    [OPPONENT_ALEXA] =
+    [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Alexa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexa }
     },
 
-    [OPPONENT_RUBEN] =
+    [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Ruben
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ruben }
     },
 
-    [OPPONENT_KOJI] =
+    [TRAINER_KOJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koji }
     },
 
-    [OPPONENT_WAYNE] =
+    [TRAINER_WAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Wayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wayne }
     },
 
-    [OPPONENT_BYRON] =
+    [TRAINER_BYRON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Byron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Byron }
     },
 
-    [OPPONENT_REED] =
+    [TRAINER_REED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Reed
+        .party = {.NoItemDefaultMoves = gTrainerParty_Reed }
     },
 
-    [OPPONENT_TISHA] =
+    [TRAINER_TISHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tisha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tisha }
     },
 
-    [OPPONENT_TORI_AND_TIA] =
+    [TRAINER_TORI_AND_TIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ToriAndTia
+        .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia }
     },
 
-    [OPPONENT_KIM_AND_IRIS] =
+    [TRAINER_KIM_AND_IRIS] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KimAndIris
+        .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris }
     },
 
-    [OPPONENT_TYRA_AND_IVY] =
+    [TRAINER_TYRA_AND_IVY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_TyraAndIvy
+        .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy }
     },
 
-    [OPPONENT_MEL_AND_PAUL] =
+    [TRAINER_MEL_AND_PAUL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MelAndPaul
+        .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul }
     },
 
-    [OPPONENT_JOHN_AND_JAY_1] =
+    [TRAINER_JOHN_AND_JAY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay1
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_2] =
+    [TRAINER_JOHN_AND_JAY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay2
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_3] =
+    [TRAINER_JOHN_AND_JAY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay3
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_4] =
+    [TRAINER_JOHN_AND_JAY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay4
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_5] =
+    [TRAINER_JOHN_AND_JAY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay5
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 }
     },
 
-    [OPPONENT_RELI_AND_IAN] =
+    [TRAINER_RELI_AND_IAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ReliAndIan
+        .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan }
     },
 
-    [OPPONENT_RITA_AND_SAM_1] =
+    [TRAINER_RITA_AND_SAM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam1
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 }
     },
 
-    [OPPONENT_RITA_AND_SAM_2] =
+    [TRAINER_RITA_AND_SAM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam2
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 }
     },
 
-    [OPPONENT_RITA_AND_SAM_3] =
+    [TRAINER_RITA_AND_SAM_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam3
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 }
     },
 
-    [OPPONENT_RITA_AND_SAM_4] =
+    [TRAINER_RITA_AND_SAM_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam4
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 }
     },
 
-    [OPPONENT_RITA_AND_SAM_5] =
+    [TRAINER_RITA_AND_SAM_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam5
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 }
     },
 
-    [OPPONENT_LISA_AND_RAY] =
+    [TRAINER_LISA_AND_RAY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LisaAndRay
+        .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay }
     },
 
-    [OPPONENT_EUGENE] =
+    [TRAINER_EUGENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Eugene
-    }
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eugene }
+    },
 };
diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h
index fbcdd5a4e..621945db8 100644
--- a/src/data/trainers_en.h
+++ b/src/data/trainers_en.h
@@ -1,5 +1,5 @@
 const struct Trainer gTrainers[] = {
-    [OPPONENT_NONE] =
+    [TRAINER_NONE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1,
@@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 0,
-        .party = NULL
+        .party = {.NoItemDefaultMoves = NULL }
     },
 
-    [OPPONENT_ARCHIE_1] =
+    [TRAINER_ARCHIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Archie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 }
     },
 
-    [OPPONENT_GRUNT_1] =
+    [TRAINER_GRUNT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 }
     },
 
-    [OPPONENT_GRUNT_2] =
+    [TRAINER_GRUNT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 }
     },
 
-    [OPPONENT_GRUNT_3] =
+    [TRAINER_GRUNT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 }
     },
 
-    [OPPONENT_GRUNT_4] =
+    [TRAINER_GRUNT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 }
     },
 
-    [OPPONENT_GRUNT_5] =
+    [TRAINER_GRUNT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 }
     },
 
-    [OPPONENT_GRUNT_6] =
+    [TRAINER_GRUNT_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 }
     },
 
-    [OPPONENT_GRUNT_7] =
+    [TRAINER_GRUNT_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 }
     },
 
-    [OPPONENT_GRUNT_8] =
+    [TRAINER_GRUNT_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 }
     },
 
-    [OPPONENT_GRUNT_9] =
+    [TRAINER_GRUNT_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 }
     },
 
-    [OPPONENT_GRUNT_10] =
+    [TRAINER_GRUNT_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 }
     },
 
-    [OPPONENT_GRUNT_11] =
+    [TRAINER_GRUNT_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 }
     },
 
-    [OPPONENT_GRUNT_12] =
+    [TRAINER_GRUNT_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 }
     },
 
-    [OPPONENT_GRUNT_13] =
+    [TRAINER_GRUNT_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 }
     },
 
-    [OPPONENT_GRUNT_14] =
+    [TRAINER_GRUNT_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 }
     },
 
-    [OPPONENT_GRUNT_15] =
+    [TRAINER_GRUNT_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 }
     },
 
-    [OPPONENT_GRUNT_16] =
+    [TRAINER_GRUNT_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 }
     },
 
-    [OPPONENT_GRUNT_17] =
+    [TRAINER_GRUNT_17] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt17
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 }
     },
 
-    [OPPONENT_GRUNT_18] =
+    [TRAINER_GRUNT_18] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt18
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 }
     },
 
-    [OPPONENT_GRUNT_19] =
+    [TRAINER_GRUNT_19] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt19
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 }
     },
 
-    [OPPONENT_GRUNT_20] =
+    [TRAINER_GRUNT_20] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt20
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 }
     },
 
-    [OPPONENT_GRUNT_21] =
+    [TRAINER_GRUNT_21] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt21
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 }
     },
 
-    [OPPONENT_GRUNT_22] =
+    [TRAINER_GRUNT_22] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt22
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 }
     },
 
-    [OPPONENT_GRUNT_23] =
+    [TRAINER_GRUNT_23] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt23
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 }
     },
 
-    [OPPONENT_GRUNT_24] =
+    [TRAINER_GRUNT_24] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt24
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 }
     },
 
-    [OPPONENT_GRUNT_25] =
+    [TRAINER_GRUNT_25] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt25
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 }
     },
 
-    [OPPONENT_GRUNT_26] =
+    [TRAINER_GRUNT_26] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt26
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 }
     },
 
-    [OPPONENT_GRUNT_27] =
+    [TRAINER_GRUNT_27] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
@@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt27
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 }
     },
 
-    [OPPONENT_ANONYMOUS_1] =
+    [TRAINER_ANONYMOUS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 }
     },
 
-    [OPPONENT_MATT_1] =
+    [TRAINER_MATT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Matt1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 }
     },
 
-    [OPPONENT_MATT_2] =
+    [TRAINER_MATT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Matt2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 }
     },
 
-    [OPPONENT_SHELLY_1] =
+    [TRAINER_SHELLY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 }
     },
 
-    [OPPONENT_SHELLY_2] =
+    [TRAINER_SHELLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelly2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 }
     },
 
-    [OPPONENT_ARCHIE_2] =
+    [TRAINER_ARCHIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 }
     },
 
-    [OPPONENT_ARCHIE_3] =
+    [TRAINER_ARCHIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
@@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Archie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 }
     },
 
-    [OPPONENT_DAISY] =
+    [TRAINER_DAISY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisy }
     },
 
-    [OPPONENT_ROSE_1] =
+    [TRAINER_ROSE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 }
     },
 
-    [OPPONENT_LILY] =
+    [TRAINER_LILY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lily
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lily }
     },
 
-    [OPPONENT_VIOLET] =
+    [TRAINER_VIOLET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Violet
+        .party = {.NoItemDefaultMoves = gTrainerParty_Violet }
     },
 
-    [OPPONENT_ROSE_2] =
+    [TRAINER_ROSE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rose2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 }
     },
 
-    [OPPONENT_ROSE_3] =
+    [TRAINER_ROSE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 }
     },
 
-    [OPPONENT_ROSE_4] =
+    [TRAINER_ROSE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 }
     },
 
-    [OPPONENT_ROSE_5] =
+    [TRAINER_ROSE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
@@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Rose5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 }
     },
 
-    [OPPONENT_DUSTY_1] =
+    [TRAINER_DUSTY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty1
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 }
     },
 
-    [OPPONENT_CHIP] =
+    [TRAINER_CHIP] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Chip
+        .party = {.NoItemCustomMoves = gTrainerParty_Chip }
     },
 
-    [OPPONENT_FOSTER] =
+    [TRAINER_FOSTER] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Foster
+        .party = {.NoItemCustomMoves = gTrainerParty_Foster }
     },
 
-    [OPPONENT_DUSTY_2] =
+    [TRAINER_DUSTY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty2
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 }
     },
 
-    [OPPONENT_DUSTY_3] =
+    [TRAINER_DUSTY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty3
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 }
     },
 
-    [OPPONENT_DUSTY_4] =
+    [TRAINER_DUSTY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty4
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 }
     },
 
-    [OPPONENT_DUSTY_5] =
+    [TRAINER_DUSTY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
@@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dusty5
+        .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_1] =
+    [TRAINER_GABBY_AND_TY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 }
     },
 
-    [OPPONENT_GABBY_AND_TY_2] =
+    [TRAINER_GABBY_AND_TY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 }
     },
 
-    [OPPONENT_GABBY_AND_TY_3] =
+    [TRAINER_GABBY_AND_TY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 }
     },
 
-    [OPPONENT_GABBY_AND_TY_4] =
+    [TRAINER_GABBY_AND_TY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 }
     },
 
-    [OPPONENT_GABBY_AND_TY_5] =
+    [TRAINER_GABBY_AND_TY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 }
     },
 
-    [OPPONENT_GABBY_AND_TY_6] =
+    [TRAINER_GABBY_AND_TY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
@@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GabbyAndTy6
+        .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 }
     },
 
-    [OPPONENT_LOLA_1] =
+    [TRAINER_LOLA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 }
     },
 
-    [OPPONENT_CARMEN] =
+    [TRAINER_CARMEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Carmen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carmen }
     },
 
-    [OPPONENT_GWEN] =
+    [TRAINER_GWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gwen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gwen }
     },
 
-    [OPPONENT_LOLA_2] =
+    [TRAINER_LOLA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 }
     },
 
-    [OPPONENT_LOLA_3] =
+    [TRAINER_LOLA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 }
     },
 
-    [OPPONENT_LOLA_4] =
+    [TRAINER_LOLA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 }
     },
 
-    [OPPONENT_LOLA_5] =
+    [TRAINER_LOLA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_F,
@@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lola5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 }
     },
 
-    [OPPONENT_RICKY_1] =
+    [TRAINER_RICKY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky1
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 }
     },
 
-    [OPPONENT_SIMON] =
+    [TRAINER_SIMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Simon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Simon }
     },
 
-    [OPPONENT_CHARLIE] =
+    [TRAINER_CHARLIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Charlie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Charlie }
     },
 
-    [OPPONENT_RICKY_2] =
+    [TRAINER_RICKY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky2
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 }
     },
 
-    [OPPONENT_RICKY_3] =
+    [TRAINER_RICKY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky3
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 }
     },
 
-    [OPPONENT_RICKY_4] =
+    [TRAINER_RICKY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky4
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 }
     },
 
-    [OPPONENT_RICKY_5] =
+    [TRAINER_RICKY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TUBER_M,
@@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ricky5
+        .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 }
     },
 
-    [OPPONENT_RANDALL] =
+    [TRAINER_RANDALL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Randall
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randall }
     },
 
-    [OPPONENT_PARKER] =
+    [TRAINER_PARKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Parker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Parker }
     },
 
-    [OPPONENT_GEORGE] =
+    [TRAINER_GEORGE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_George
+        .party = {.NoItemDefaultMoves = gTrainerParty_George }
     },
 
-    [OPPONENT_BERKE] =
+    [TRAINER_BERKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Berke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Berke }
     },
 
-    [OPPONENT_CLYDE] =
+    [TRAINER_CLYDE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Clyde
+        .party = {.NoItemCustomMoves = gTrainerParty_Clyde }
     },
 
-    [OPPONENT_VINCENT] =
+    [TRAINER_VINCENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vincent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vincent }
     },
 
-    [OPPONENT_LEROY] =
+    [TRAINER_LEROY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Leroy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leroy }
     },
 
-    [OPPONENT_WILTON_1] =
+    [TRAINER_WILTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 }
     },
 
-    [OPPONENT_EDGAR] =
+    [TRAINER_EDGAR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Edgar
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edgar }
     },
 
-    [OPPONENT_ALBERT] =
+    [TRAINER_ALBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Albert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Albert }
     },
 
-    [OPPONENT_SAMUEL] =
+    [TRAINER_SAMUEL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Samuel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samuel }
     },
 
-    [OPPONENT_VITO] =
+    [TRAINER_VITO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Vito
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vito }
     },
 
-    [OPPONENT_OWEN] =
+    [TRAINER_OWEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Owen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Owen }
     },
 
-    [OPPONENT_WILTON_2] =
+    [TRAINER_WILTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 }
     },
 
-    [OPPONENT_WILTON_3] =
+    [TRAINER_WILTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 }
     },
 
-    [OPPONENT_WILTON_4] =
+    [TRAINER_WILTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 }
     },
 
-    [OPPONENT_WILTON_5] =
+    [TRAINER_WILTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wilton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 }
     },
 
-    [OPPONENT_WARREN] =
+    [TRAINER_WARREN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Warren
+        .party = {.NoItemDefaultMoves = gTrainerParty_Warren }
     },
 
-    [OPPONENT_MARY] =
+    [TRAINER_MARY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Mary
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mary }
     },
 
-    [OPPONENT_LORI] =
+    [TRAINER_LORI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Lori
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lori }
     },
 
-    [OPPONENT_JODY] =
+    [TRAINER_JODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jody }
     },
 
-    [OPPONENT_WENDY] =
+    [TRAINER_WENDY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Wendy
+        .party = {.NoItemCustomMoves = gTrainerParty_Wendy }
     },
 
-    [OPPONENT_ELAINE] =
+    [TRAINER_ELAINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Elaine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elaine }
     },
 
-    [OPPONENT_BROOKE_1] =
+    [TRAINER_BROOKE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 }
     },
 
-    [OPPONENT_JENNIFER] =
+    [TRAINER_JENNIFER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jennifer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer }
     },
 
-    [OPPONENT_HOPE] =
+    [TRAINER_HOPE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Hope
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hope }
     },
 
-    [OPPONENT_SHANNON] =
+    [TRAINER_SHANNON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Shannon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shannon }
     },
 
-    [OPPONENT_MICHELLE] =
+    [TRAINER_MICHELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Michelle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Michelle }
     },
 
-    [OPPONENT_CAROLINE] =
+    [TRAINER_CAROLINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Caroline
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caroline }
     },
 
-    [OPPONENT_JULIE] =
+    [TRAINER_JULIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Julie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Julie }
     },
 
-    [OPPONENT_BROOKE_2] =
+    [TRAINER_BROOKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 }
     },
 
-    [OPPONENT_BROOKE_3] =
+    [TRAINER_BROOKE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 }
     },
 
-    [OPPONENT_BROOKE_4] =
+    [TRAINER_BROOKE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 }
     },
 
-    [OPPONENT_BROOKE_5] =
+    [TRAINER_BROOKE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brooke5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 }
     },
 
-    [OPPONENT_PATRICIA] =
+    [TRAINER_PATRICIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Patricia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Patricia }
     },
 
-    [OPPONENT_KINDRA] =
+    [TRAINER_KINDRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kindra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kindra }
     },
 
-    [OPPONENT_TAMMY] =
+    [TRAINER_TAMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tammy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tammy }
     },
 
-    [OPPONENT_VALERIE_1] =
+    [TRAINER_VALERIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 }
     },
 
-    [OPPONENT_TASHA] =
+    [TRAINER_TASHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tasha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tasha }
     },
 
-    [OPPONENT_VALERIE_2] =
+    [TRAINER_VALERIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Valerie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 }
     },
 
-    [OPPONENT_VALERIE_3] =
+    [TRAINER_VALERIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 }
     },
 
-    [OPPONENT_VALERIE_4] =
+    [TRAINER_VALERIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Valerie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 }
     },
 
-    [OPPONENT_VALERIE_5] =
+    [TRAINER_VALERIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
@@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Valerie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 }
     },
 
-    [OPPONENT_CINDY_1] =
+    [TRAINER_CINDY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy1
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 }
     },
 
-    [OPPONENT_ANONYMOUS_2] =
+    [TRAINER_ANONYMOUS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 }
     },
 
-    [OPPONENT_BRIANNA_1] =
+    [TRAINER_BRIANNA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brianna1
+        .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 }
     },
 
-    [OPPONENT_CINDY_2] =
+    [TRAINER_CINDY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 }
     },
 
-    [OPPONENT_BRIANNA_2] =
+    [TRAINER_BRIANNA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brianna2
+        .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 }
     },
 
-    [OPPONENT_ANETTE] =
+    [TRAINER_ANETTE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anette
+        .party = {.ItemDefaultMoves = gTrainerParty_Anette }
     },
 
-    [OPPONENT_CINDY_3] =
+    [TRAINER_CINDY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy3
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 }
     },
 
-    [OPPONENT_CINDY_4] =
+    [TRAINER_CINDY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy4
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 }
     },
 
-    [OPPONENT_CINDY_5] =
+    [TRAINER_CINDY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy5
+        .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 }
     },
 
-    [OPPONENT_CINDY_6] =
+    [TRAINER_CINDY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LADY,
@@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cindy6
+        .party = {.ItemCustomMoves = gTrainerParty_Cindy6 }
     },
 
-    [OPPONENT_MELISSA] =
+    [TRAINER_MELISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Melissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Melissa }
     },
 
-    [OPPONENT_SHEILA] =
+    [TRAINER_SHEILA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sheila
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sheila }
     },
 
-    [OPPONENT_SHIRLEY] =
+    [TRAINER_SHIRLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Shirley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shirley }
     },
 
-    [OPPONENT_JESSICA_1] =
+    [TRAINER_JESSICA_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica1
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 }
     },
 
-    [OPPONENT_CONNIE] =
+    [TRAINER_CONNIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Connie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connie }
     },
 
-    [OPPONENT_BRIDGET] =
+    [TRAINER_BRIDGET] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Bridget
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bridget }
     },
 
-    [OPPONENT_OLIVIA] =
+    [TRAINER_OLIVIA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Olivia
+        .party = {.NoItemCustomMoves = gTrainerParty_Olivia }
     },
 
-    [OPPONENT_TIFFANY] =
+    [TRAINER_TIFFANY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tiffany
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany }
     },
 
-    [OPPONENT_JESSICA_2] =
+    [TRAINER_JESSICA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica2
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 }
     },
 
-    [OPPONENT_JESSICA_3] =
+    [TRAINER_JESSICA_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica3
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 }
     },
 
-    [OPPONENT_JESSICA_4] =
+    [TRAINER_JESSICA_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica4
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 }
     },
 
-    [OPPONENT_JESSICA_5] =
+    [TRAINER_JESSICA_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jessica5
+        .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 }
     },
 
-    [OPPONENT_WINSTON_1] =
+    [TRAINER_WINSTON_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston1
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston1 }
     },
 
-    [OPPONENT_ANONYMOUS_3] =
+    [TRAINER_ANONYMOUS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 }
     },
 
-    [OPPONENT_GARRET] =
+    [TRAINER_GARRET] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Garret
+        .party = {.ItemDefaultMoves = gTrainerParty_Garret }
     },
 
-    [OPPONENT_WINSTON_2] =
+    [TRAINER_WINSTON_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston2
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston2 }
     },
 
-    [OPPONENT_WINSTON_3] =
+    [TRAINER_WINSTON_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston3
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston3 }
     },
 
-    [OPPONENT_WINSTON_4] =
+    [TRAINER_WINSTON_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston4
+        .party = {.ItemDefaultMoves = gTrainerParty_Winston4 }
     },
 
-    [OPPONENT_WINSTON_5] =
+    [TRAINER_WINSTON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_RICH_BOY,
@@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Winston5
+        .party = {.ItemCustomMoves = gTrainerParty_Winston5 }
     },
 
-    [OPPONENT_STEVE_1] =
+    [TRAINER_STEVE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 }
     },
 
-    [OPPONENT_CHRIS] =
+    [TRAINER_CHRIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Chris
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chris }
     },
 
-    [OPPONENT_MARK] =
+    [TRAINER_MARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Mark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mark }
     },
 
-    [OPPONENT_KENN] =
+    [TRAINER_KENN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kenn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kenn }
     },
 
-    [OPPONENT_STEVE_2] =
+    [TRAINER_STEVE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Steve2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 }
     },
 
-    [OPPONENT_STEVE_3] =
+    [TRAINER_STEVE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 }
     },
 
-    [OPPONENT_STEVE_4] =
+    [TRAINER_STEVE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 }
     },
 
-    [OPPONENT_STEVE_5] =
+    [TRAINER_STEVE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
@@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Steve5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 }
     },
 
-    [OPPONENT_LUIS] =
+    [TRAINER_LUIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Luis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Luis }
     },
 
-    [OPPONENT_AUSTIN] =
+    [TRAINER_AUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Austin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Austin }
     },
 
-    [OPPONENT_DOUGLAS] =
+    [TRAINER_DOUGLAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Douglas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Douglas }
     },
 
-    [OPPONENT_DARRIN] =
+    [TRAINER_DARRIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darrin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darrin }
     },
 
-    [OPPONENT_TONY_1] =
+    [TRAINER_TONY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 }
     },
 
-    [OPPONENT_JEROME] =
+    [TRAINER_JEROME] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerome
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerome }
     },
 
-    [OPPONENT_MATTHEW] =
+    [TRAINER_MATTHEW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Matthew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Matthew }
     },
 
-    [OPPONENT_DAVID] =
+    [TRAINER_DAVID] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_David
+        .party = {.NoItemDefaultMoves = gTrainerParty_David }
     },
 
-    [OPPONENT_SPENCER] =
+    [TRAINER_SPENCER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Spencer
+        .party = {.NoItemDefaultMoves = gTrainerParty_Spencer }
     },
 
-    [OPPONENT_ROLAND] =
+    [TRAINER_ROLAND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Roland
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roland }
     },
 
-    [OPPONENT_CODY] =
+    [TRAINER_CODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cody }
     },
 
-    [OPPONENT_STAN] =
+    [TRAINER_STAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Stan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Stan }
     },
 
-    [OPPONENT_BARRY] =
+    [TRAINER_BARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Barry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barry }
     },
 
-    [OPPONENT_DEAN] =
+    [TRAINER_DEAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dean
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dean }
     },
 
-    [OPPONENT_RODNEY] =
+    [TRAINER_RODNEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rodney
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rodney }
     },
 
-    [OPPONENT_RICHARD] =
+    [TRAINER_RICHARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Richard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Richard }
     },
 
-    [OPPONENT_HERMAN] =
+    [TRAINER_HERMAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Herman
+        .party = {.NoItemDefaultMoves = gTrainerParty_Herman }
     },
 
-    [OPPONENT_ANONYMOUS_4] =
+    [TRAINER_ANONYMOUS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 }
     },
 
-    [OPPONENT_GILBERT] =
+    [TRAINER_GILBERT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Gilbert
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert }
     },
 
-    [OPPONENT_FRANKLIN] =
+    [TRAINER_FRANKLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Franklin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Franklin }
     },
 
-    [OPPONENT_DANNY] =
+    [TRAINER_DANNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Danny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danny }
     },
 
-    [OPPONENT_JACK] =
+    [TRAINER_JACK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jack
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jack }
     },
 
-    [OPPONENT_DUDLEY] =
+    [TRAINER_DUDLEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dudley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dudley }
     },
 
-    [OPPONENT_CHAD] =
+    [TRAINER_CHAD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chad
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chad }
     },
 
-    [OPPONENT_TONY_2] =
+    [TRAINER_TONY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 }
     },
 
-    [OPPONENT_TONY_3] =
+    [TRAINER_TONY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tony3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 }
     },
 
-    [OPPONENT_TONY_4] =
+    [TRAINER_TONY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 }
     },
 
-    [OPPONENT_TONY_5] =
+    [TRAINER_TONY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tony5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 }
     },
 
-    [OPPONENT_HIDEKI] =
+    [TRAINER_HIDEKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hideki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideki }
     },
 
-    [OPPONENT_HITOSHI] =
+    [TRAINER_HITOSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hitoshi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi }
     },
 
-    [OPPONENT_KIYO] =
+    [TRAINER_KIYO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kiyo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo }
     },
 
-    [OPPONENT_KOICHI] =
+    [TRAINER_KOICHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koichi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koichi }
     },
 
-    [OPPONENT_NOB_1] =
+    [TRAINER_NOB_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 }
     },
 
-    [OPPONENT_NOB_2] =
+    [TRAINER_NOB_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nob2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 }
     },
 
-    [OPPONENT_NOB_3] =
+    [TRAINER_NOB_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nob3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 }
     },
 
-    [OPPONENT_NOB_4] =
+    [TRAINER_NOB_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nob4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 }
     },
 
-    [OPPONENT_NOB_5] =
+    [TRAINER_NOB_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Nob5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nob5 }
     },
 
-    [OPPONENT_YUJI] =
+    [TRAINER_YUJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Yuji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yuji }
     },
 
-    [OPPONENT_DAISUKE] =
+    [TRAINER_DAISUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Daisuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke }
     },
 
-    [OPPONENT_ATSUSHI] =
+    [TRAINER_ATSUSHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Atsushi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi }
     },
 
-    [OPPONENT_KIRK] =
+    [TRAINER_KIRK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kirk
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kirk }
     },
 
-    [OPPONENT_SCOTT] =
+    [TRAINER_SCOTT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Scott
+        .party = {.NoItemDefaultMoves = gTrainerParty_Scott }
     },
 
-    [OPPONENT_HARVEY] =
+    [TRAINER_HARVEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Harvey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Harvey }
     },
 
-    [OPPONENT_SHAWN] =
+    [TRAINER_SHAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Shawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shawn }
     },
 
-    [OPPONENT_RANDY] =
+    [TRAINER_RANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Randy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Randy }
     },
 
-    [OPPONENT_DALTON_1] =
+    [TRAINER_DALTON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 }
     },
 
-    [OPPONENT_DALTON_2] =
+    [TRAINER_DALTON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 }
     },
 
-    [OPPONENT_DALTON_3] =
+    [TRAINER_DALTON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 }
     },
 
-    [OPPONENT_DALTON_4] =
+    [TRAINER_DALTON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 }
     },
 
-    [OPPONENT_DALTON_5] =
+    [TRAINER_DALTON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GUITARIST,
@@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dalton5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 }
     },
 
-    [OPPONENT_COLE] =
+    [TRAINER_COLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cole }
     },
 
-    [OPPONENT_FLINT] =
+    [TRAINER_FLINT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Flint
+        .party = {.NoItemDefaultMoves = gTrainerParty_Flint }
     },
 
-    [OPPONENT_AXLE] =
+    [TRAINER_AXLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Axle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Axle }
     },
 
-    [OPPONENT_JAKE] =
+    [TRAINER_JAKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jake
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jake }
     },
 
-    [OPPONENT_ANDY] =
+    [TRAINER_ANDY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Andy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andy }
     },
 
-    [OPPONENT_BERNIE_1] =
+    [TRAINER_BERNIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 }
     },
 
-    [OPPONENT_BERNIE_2] =
+    [TRAINER_BERNIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 }
     },
 
-    [OPPONENT_BERNIE_3] =
+    [TRAINER_BERNIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 }
     },
 
-    [OPPONENT_BERNIE_4] =
+    [TRAINER_BERNIE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 }
     },
 
-    [OPPONENT_BERNIE_5] =
+    [TRAINER_BERNIE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_KINDLER,
@@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Bernie5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 }
     },
 
-    [OPPONENT_DREW] =
+    [TRAINER_DREW] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Drew
+        .party = {.NoItemCustomMoves = gTrainerParty_Drew }
     },
 
-    [OPPONENT_CLIFF] =
+    [TRAINER_CLIFF] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Cliff
+        .party = {.NoItemCustomMoves = gTrainerParty_Cliff }
     },
 
-    [OPPONENT_LARRY] =
+    [TRAINER_LARRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Larry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Larry }
     },
 
-    [OPPONENT_SHANE] =
+    [TRAINER_SHANE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Shane
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shane }
     },
 
-    [OPPONENT_JUSTIN] =
+    [TRAINER_JUSTIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Justin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Justin }
     },
 
-    [OPPONENT_ETHAN_1] =
+    [TRAINER_ETHAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 }
     },
 
-    [OPPONENT_JEFF] =
+    [TRAINER_JEFF] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jeff
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jeff }
     },
 
-    [OPPONENT_TRAVIS] =
+    [TRAINER_TRAVIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Travis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Travis }
     },
 
-    [OPPONENT_ETHAN_2] =
+    [TRAINER_ETHAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 }
     },
 
-    [OPPONENT_ETHAN_3] =
+    [TRAINER_ETHAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Ethan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 }
     },
 
-    [OPPONENT_ETHAN_4] =
+    [TRAINER_ETHAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 }
     },
 
-    [OPPONENT_ETHAN_5] =
+    [TRAINER_ETHAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ethan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 }
     },
 
-    [OPPONENT_BRENT] =
+    [TRAINER_BRENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brent }
     },
 
-    [OPPONENT_DONALD] =
+    [TRAINER_DONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Donald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donald }
     },
 
-    [OPPONENT_TAYLOR] =
+    [TRAINER_TAYLOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Taylor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Taylor }
     },
 
-    [OPPONENT_BRANDON_1] =
+    [TRAINER_BRANDON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 }
     },
 
-    [OPPONENT_DEREK] =
+    [TRAINER_DEREK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Derek
+        .party = {.NoItemDefaultMoves = gTrainerParty_Derek }
     },
 
-    [OPPONENT_BRANDON_2] =
+    [TRAINER_BRANDON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 }
     },
 
-    [OPPONENT_BRANDON_3] =
+    [TRAINER_BRANDON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Brandon3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 }
     },
 
-    [OPPONENT_BRANDON_4] =
+    [TRAINER_BRANDON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Brandon4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 }
     },
 
-    [OPPONENT_BRANDON_5] =
+    [TRAINER_BRANDON_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
@@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 5,
-        .party = gTrainerParty_Brandon5
+        .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 }
     },
 
-    [OPPONENT_EDWARD] =
+    [TRAINER_EDWARD] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Edward
+        .party = {.NoItemCustomMoves = gTrainerParty_Edward }
     },
 
-    [OPPONENT_PRESTON] =
+    [TRAINER_PRESTON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Preston
+        .party = {.NoItemDefaultMoves = gTrainerParty_Preston }
     },
 
-    [OPPONENT_VIRGIL] =
+    [TRAINER_VIRGIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Virgil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Virgil }
     },
 
-    [OPPONENT_FRITZ] =
+    [TRAINER_FRITZ] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Fritz
+        .party = {.NoItemDefaultMoves = gTrainerParty_Fritz }
     },
 
-    [OPPONENT_WILLIAM] =
+    [TRAINER_WILLIAM] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_William
+        .party = {.NoItemDefaultMoves = gTrainerParty_William }
     },
 
-    [OPPONENT_JOSHUA] =
+    [TRAINER_JOSHUA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joshua
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joshua }
     },
 
-    [OPPONENT_CAMERON_1] =
+    [TRAINER_CAMERON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 }
     },
 
-    [OPPONENT_CAMERON_2] =
+    [TRAINER_CAMERON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 }
     },
 
-    [OPPONENT_CAMERON_3] =
+    [TRAINER_CAMERON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 }
     },
 
-    [OPPONENT_CAMERON_4] =
+    [TRAINER_CAMERON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 }
     },
 
-    [OPPONENT_CAMERON_5] =
+    [TRAINER_CAMERON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cameron5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 }
     },
 
-    [OPPONENT_JACLYN] =
+    [TRAINER_JACLYN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jaclyn
+        .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn }
     },
 
-    [OPPONENT_HANNAH] =
+    [TRAINER_HANNAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Hannah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hannah }
     },
 
-    [OPPONENT_SAMANTHA] =
+    [TRAINER_SAMANTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Samantha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Samantha }
     },
 
-    [OPPONENT_MAURA] =
+    [TRAINER_MAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Maura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maura }
     },
 
-    [OPPONENT_KAYLA] =
+    [TRAINER_KAYLA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kayla
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kayla }
     },
 
-    [OPPONENT_ALEXIS] =
+    [TRAINER_ALEXIS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alexis
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexis }
     },
 
-    [OPPONENT_JACKI_1] =
+    [TRAINER_JACKI_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 }
     },
 
-    [OPPONENT_JACKI_2] =
+    [TRAINER_JACKI_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 }
     },
 
-    [OPPONENT_JACKI_3] =
+    [TRAINER_JACKI_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 }
     },
 
-    [OPPONENT_JACKI_4] =
+    [TRAINER_JACKI_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 }
     },
 
-    [OPPONENT_JACKI_5] =
+    [TRAINER_JACKI_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PSYCHIC,
@@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jacki5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 }
     },
 
-    [OPPONENT_WALTER_1] =
+    [TRAINER_WALTER_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 }
     },
 
-    [OPPONENT_TUCKER] =
+    [TRAINER_TUCKER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tucker
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tucker }
     },
 
-    [OPPONENT_THOMAS] =
+    [TRAINER_THOMAS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Thomas
+        .party = {.NoItemDefaultMoves = gTrainerParty_Thomas }
     },
 
-    [OPPONENT_WALTER_2] =
+    [TRAINER_WALTER_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Walter2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 }
     },
 
-    [OPPONENT_WALTER_3] =
+    [TRAINER_WALTER_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter3
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter3 }
     },
 
-    [OPPONENT_WALTER_4] =
+    [TRAINER_WALTER_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Walter4
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter4 }
     },
 
-    [OPPONENT_WALTER_5] =
+    [TRAINER_WALTER_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
@@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Walter5
+        .party = {.NoItemCustomMoves = gTrainerParty_Walter5 }
     },
 
-    [OPPONENT_SIDNEY] =
+    [TRAINER_SIDNEY] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Sidney
+        .party = {.ItemCustomMoves = gTrainerParty_Sidney }
     },
 
-    [OPPONENT_PHOEBE] =
+    [TRAINER_PHOEBE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Phoebe
+        .party = {.ItemCustomMoves = gTrainerParty_Phoebe }
     },
 
-    [OPPONENT_GLACIA] =
+    [TRAINER_GLACIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Glacia
+        .party = {.ItemCustomMoves = gTrainerParty_Glacia }
     },
 
-    [OPPONENT_DRAKE] =
+    [TRAINER_DRAKE] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
@@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Drake
+        .party = {.ItemCustomMoves = gTrainerParty_Drake }
     },
 
-    [OPPONENT_ROXANNE] =
+    [TRAINER_ROXANNE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Roxanne
+        .party = {.NoItemCustomMoves = gTrainerParty_Roxanne }
     },
 
-    [OPPONENT_BRAWLY] =
+    [TRAINER_BRAWLY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Brawly
+        .party = {.NoItemCustomMoves = gTrainerParty_Brawly }
     },
 
-    [OPPONENT_WATTSON] =
+    [TRAINER_WATTSON] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Wattson
+        .party = {.NoItemCustomMoves = gTrainerParty_Wattson }
     },
 
-    [OPPONENT_FLANNERY] =
+    [TRAINER_FLANNERY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Flannery
+        .party = {.NoItemCustomMoves = gTrainerParty_Flannery }
     },
 
-    [OPPONENT_NORMAN] =
+    [TRAINER_NORMAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Norman
+        .party = {.NoItemCustomMoves = gTrainerParty_Norman }
     },
 
-    [OPPONENT_WINONA] =
+    [TRAINER_WINONA] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Winona
+        .party = {.NoItemCustomMoves = gTrainerParty_Winona }
     },
 
-    [OPPONENT_TATE_AND_LIZA] =
+    [TRAINER_TATE_AND_LIZA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_TateAndLiza
+        .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza }
     },
 
-    [OPPONENT_WALLACE] =
+    [TRAINER_WALLACE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_LEADER,
@@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wallace
+        .party = {.NoItemCustomMoves = gTrainerParty_Wallace }
     },
 
-    [OPPONENT_JERRY_1] =
+    [TRAINER_JERRY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jerry1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 }
     },
 
-    [OPPONENT_TED] =
+    [TRAINER_TED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ted
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ted }
     },
 
-    [OPPONENT_PAUL] =
+    [TRAINER_PAUL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Paul
+        .party = {.NoItemDefaultMoves = gTrainerParty_Paul }
     },
 
-    [OPPONENT_JERRY_2] =
+    [TRAINER_JERRY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 }
     },
 
-    [OPPONENT_JERRY_3] =
+    [TRAINER_JERRY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 }
     },
 
-    [OPPONENT_JERRY_4] =
+    [TRAINER_JERRY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jerry4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 }
     },
 
-    [OPPONENT_JERRY_5] =
+    [TRAINER_JERRY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jerry5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 }
     },
 
-    [OPPONENT_KAREN_1] =
+    [TRAINER_KAREN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 }
     },
 
-    [OPPONENT_GEORGIA] =
+    [TRAINER_GEORGIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Georgia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Georgia }
     },
 
-    [OPPONENT_KAREN_2] =
+    [TRAINER_KAREN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 }
     },
 
-    [OPPONENT_KAREN_3] =
+    [TRAINER_KAREN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 }
     },
 
-    [OPPONENT_KAREN_4] =
+    [TRAINER_KAREN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 }
     },
 
-    [OPPONENT_KAREN_5] =
+    [TRAINER_KAREN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
@@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Karen5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 }
     },
 
-    [OPPONENT_KATE_AND_JOY] =
+    [TRAINER_KATE_AND_JOY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KateAndJoy
+        .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy }
     },
 
-    [OPPONENT_ANNA_AND_MEG_1] =
+    [TRAINER_ANNA_AND_MEG_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg1
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_2] =
+    [TRAINER_ANNA_AND_MEG_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg2
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_3] =
+    [TRAINER_ANNA_AND_MEG_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg3
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_4] =
+    [TRAINER_ANNA_AND_MEG_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg4
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 }
     },
 
-    [OPPONENT_ANNA_AND_MEG_5] =
+    [TRAINER_ANNA_AND_MEG_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AnnaAndMeg5
+        .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 }
     },
 
-    [OPPONENT_VICTOR] =
+    [TRAINER_VICTOR] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Victor
+        .party = {.ItemDefaultMoves = gTrainerParty_Victor }
     },
 
-    [OPPONENT_MIGUEL_1] =
+    [TRAINER_MIGUEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 }
     },
 
-    [OPPONENT_COLTON] =
+    [TRAINER_COLTON] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Colton
+        .party = {.ItemCustomMoves = gTrainerParty_Colton }
     },
 
-    [OPPONENT_MIGUEL_2] =
+    [TRAINER_MIGUEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 }
     },
 
-    [OPPONENT_MIGUEL_3] =
+    [TRAINER_MIGUEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 }
     },
 
-    [OPPONENT_MIGUEL_4] =
+    [TRAINER_MIGUEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 }
     },
 
-    [OPPONENT_MIGUEL_5] =
+    [TRAINER_MIGUEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Miguel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 }
     },
 
-    [OPPONENT_VICTORIA] =
+    [TRAINER_VICTORIA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Victoria
+        .party = {.ItemDefaultMoves = gTrainerParty_Victoria }
     },
 
-    [OPPONENT_VANESSA] =
+    [TRAINER_VANESSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vanessa
+        .party = {.ItemDefaultMoves = gTrainerParty_Vanessa }
     },
 
-    [OPPONENT_MARISSA] =
+    [TRAINER_MARISSA] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Marissa
+        .party = {.ItemDefaultMoves = gTrainerParty_Marissa }
     },
 
-    [OPPONENT_ISABEL_1] =
+    [TRAINER_ISABEL_1] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel1
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 }
     },
 
-    [OPPONENT_ISABEL_2] =
+    [TRAINER_ISABEL_2] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel2
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 }
     },
 
-    [OPPONENT_ISABEL_3] =
+    [TRAINER_ISABEL_3] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel3
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 }
     },
 
-    [OPPONENT_ISABEL_4] =
+    [TRAINER_ISABEL_4] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel4
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 }
     },
 
-    [OPPONENT_ISABEL_5] =
+    [TRAINER_ISABEL_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_POKEFAN,
@@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Isabel5
+        .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 }
     },
 
-    [OPPONENT_TIMOTHY_1] =
+    [TRAINER_TIMOTHY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 }
     },
 
-    [OPPONENT_TIMOTHY_2] =
+    [TRAINER_TIMOTHY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy2
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 }
     },
 
-    [OPPONENT_TIMOTHY_3] =
+    [TRAINER_TIMOTHY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy3
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 }
     },
 
-    [OPPONENT_TIMOTHY_4] =
+    [TRAINER_TIMOTHY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy4
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 }
     },
 
-    [OPPONENT_TIMOTHY_5] =
+    [TRAINER_TIMOTHY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Timothy5
+        .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 }
     },
 
-    [OPPONENT_VICKY] =
+    [TRAINER_VICKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Vicky
+        .party = {.NoItemCustomMoves = gTrainerParty_Vicky }
     },
 
-    [OPPONENT_SHELBY_1] =
+    [TRAINER_SHELBY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 }
     },
 
-    [OPPONENT_SHELBY_2] =
+    [TRAINER_SHELBY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 }
     },
 
-    [OPPONENT_SHELBY_3] =
+    [TRAINER_SHELBY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 }
     },
 
-    [OPPONENT_SHELBY_4] =
+    [TRAINER_SHELBY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 }
     },
 
-    [OPPONENT_SHELBY_5] =
+    [TRAINER_SHELBY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_EXPERT,
@@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Shelby5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 }
     },
 
-    [OPPONENT_CALVIN_1] =
+    [TRAINER_CALVIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 }
     },
 
-    [OPPONENT_BILLY] =
+    [TRAINER_BILLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Billy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Billy }
     },
 
-    [OPPONENT_JOSH] =
+    [TRAINER_JOSH] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Josh
+        .party = {.NoItemCustomMoves = gTrainerParty_Josh }
     },
 
-    [OPPONENT_TOMMY] =
+    [TRAINER_TOMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tommy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tommy }
     },
 
-    [OPPONENT_JOEY] =
+    [TRAINER_JOEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Joey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Joey }
     },
 
-    [OPPONENT_BEN] =
+    [TRAINER_BEN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ben
+        .party = {.NoItemCustomMoves = gTrainerParty_Ben }
     },
 
-    [OPPONENT_ANONYMOUS_5] =
+    [TRAINER_ANONYMOUS_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 }
     },
 
-    [OPPONENT_KEVIN] =
+    [TRAINER_KEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kevin }
     },
 
-    [OPPONENT_NEAL] =
+    [TRAINER_NEAL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Neal
+        .party = {.NoItemDefaultMoves = gTrainerParty_Neal }
     },
 
-    [OPPONENT_DILLON] =
+    [TRAINER_DILLON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dillon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dillon }
     },
 
-    [OPPONENT_CALVIN_2] =
+    [TRAINER_CALVIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Calvin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 }
     },
 
-    [OPPONENT_CALVIN_3] =
+    [TRAINER_CALVIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 }
     },
 
-    [OPPONENT_CALVIN_4] =
+    [TRAINER_CALVIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Calvin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 }
     },
 
-    [OPPONENT_CALVIN_5] =
+    [TRAINER_CALVIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Calvin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 }
     },
 
-    [OPPONENT_EDDIE] =
+    [TRAINER_EDDIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eddie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eddie }
     },
 
-    [OPPONENT_ALLEN] =
+    [TRAINER_ALLEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Allen
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allen }
     },
 
-    [OPPONENT_TIMMY] =
+    [TRAINER_TIMMY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
@@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Timmy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Timmy }
     },
 
-    [OPPONENT_STEVEN] =
+    [TRAINER_STEVEN] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_CHAMPION,
@@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 6,
-        .party = gTrainerParty_Steven
+        .party = {.ItemCustomMoves = gTrainerParty_Steven }
     },
 
-    [OPPONENT_ANDREW] =
+    [TRAINER_ANDREW] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Andrew
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrew }
     },
 
-    [OPPONENT_IVAN] =
+    [TRAINER_IVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ivan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ivan }
     },
 
-    [OPPONENT_CLAUDE] =
+    [TRAINER_CLAUDE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Claude
+        .party = {.NoItemDefaultMoves = gTrainerParty_Claude }
     },
 
-    [OPPONENT_ELLIOT_1] =
+    [TRAINER_ELLIOT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 }
     },
 
-    [OPPONENT_NED] =
+    [TRAINER_NED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Ned
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ned }
     },
 
-    [OPPONENT_DALE] =
+    [TRAINER_DALE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Dale
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dale }
     },
 
-    [OPPONENT_NOLAN] =
+    [TRAINER_NOLAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nolan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nolan }
     },
 
-    [OPPONENT_BARNY] =
+    [TRAINER_BARNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Barny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Barny }
     },
 
-    [OPPONENT_WADE] =
+    [TRAINER_WADE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Wade
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wade }
     },
 
-    [OPPONENT_CARTER] =
+    [TRAINER_CARTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Carter
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carter }
     },
 
-    [OPPONENT_ELLIOT_2] =
+    [TRAINER_ELLIOT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Elliot2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 }
     },
 
-    [OPPONENT_ELLIOT_3] =
+    [TRAINER_ELLIOT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 }
     },
 
-    [OPPONENT_ELLIOT_4] =
+    [TRAINER_ELLIOT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Elliot4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 }
     },
 
-    [OPPONENT_ELLIOT_5] =
+    [TRAINER_ELLIOT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 4,
-        .party = gTrainerParty_Elliot5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 }
     },
 
-    [OPPONENT_RONALD] =
+    [TRAINER_RONALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Ronald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ronald }
     },
 
-    [OPPONENT_JACOB] =
+    [TRAINER_JACOB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jacob
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jacob }
     },
 
-    [OPPONENT_ANTHONY] =
+    [TRAINER_ANTHONY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anthony
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anthony }
     },
 
-    [OPPONENT_BENJAMIN_1] =
+    [TRAINER_BENJAMIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 }
     },
 
-    [OPPONENT_BENJAMIN_2] =
+    [TRAINER_BENJAMIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 }
     },
 
-    [OPPONENT_BENJAMIN_3] =
+    [TRAINER_BENJAMIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 }
     },
 
-    [OPPONENT_BENJAMIN_4] =
+    [TRAINER_BENJAMIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 }
     },
 
-    [OPPONENT_BENJAMIN_5] =
+    [TRAINER_BENJAMIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Benjamin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 }
     },
 
-    [OPPONENT_ABIGAIL_1] =
+    [TRAINER_ABIGAIL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 }
     },
 
-    [OPPONENT_JASMINE] =
+    [TRAINER_JASMINE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jasmine
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine }
     },
 
-    [OPPONENT_ABIGAIL_2] =
+    [TRAINER_ABIGAIL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 }
     },
 
-    [OPPONENT_ABIGAIL_3] =
+    [TRAINER_ABIGAIL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 }
     },
 
-    [OPPONENT_ABIGAIL_4] =
+    [TRAINER_ABIGAIL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 }
     },
 
-    [OPPONENT_ABIGAIL_5] =
+    [TRAINER_ABIGAIL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Abigail5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 }
     },
 
-    [OPPONENT_DYLAN_1] =
+    [TRAINER_DYLAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 }
     },
 
-    [OPPONENT_DYLAN_2] =
+    [TRAINER_DYLAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 }
     },
 
-    [OPPONENT_DYLAN_3] =
+    [TRAINER_DYLAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 }
     },
 
-    [OPPONENT_DYLAN_4] =
+    [TRAINER_DYLAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 }
     },
 
-    [OPPONENT_DYLAN_5] =
+    [TRAINER_DYLAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dylan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 }
     },
 
-    [OPPONENT_MARIA_1] =
+    [TRAINER_MARIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 }
     },
 
-    [OPPONENT_MARIA_2] =
+    [TRAINER_MARIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 }
     },
 
-    [OPPONENT_MARIA_3] =
+    [TRAINER_MARIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 }
     },
 
-    [OPPONENT_MARIA_4] =
+    [TRAINER_MARIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 }
     },
 
-    [OPPONENT_MARIA_5] =
+    [TRAINER_MARIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Maria5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 }
     },
 
-    [OPPONENT_CALEB] =
+    [TRAINER_CALEB] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Caleb
+        .party = {.NoItemDefaultMoves = gTrainerParty_Caleb }
     },
 
-    [OPPONENT_ANONYMOUS_6] =
+    [TRAINER_ANONYMOUS_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 }
     },
 
-    [OPPONENT_ISAIAH_1] =
+    [TRAINER_ISAIAH_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 }
     },
 
-    [OPPONENT_ANONYMOUS_7] =
+    [TRAINER_ANONYMOUS_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 }
     },
 
-    [OPPONENT_CHASE] =
+    [TRAINER_CHASE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chase
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chase }
     },
 
-    [OPPONENT_ISAIAH_2] =
+    [TRAINER_ISAIAH_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 }
     },
 
-    [OPPONENT_ISAIAH_3] =
+    [TRAINER_ISAIAH_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 }
     },
 
-    [OPPONENT_ISAIAH_4] =
+    [TRAINER_ISAIAH_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 }
     },
 
-    [OPPONENT_ISAIAH_5] =
+    [TRAINER_ISAIAH_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Isaiah5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 }
     },
 
-    [OPPONENT_ANONYMOUS_8] =
+    [TRAINER_ANONYMOUS_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 }
     },
 
-    [OPPONENT_CONNOR] =
+    [TRAINER_CONNOR] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Connor
+        .party = {.NoItemDefaultMoves = gTrainerParty_Connor }
     },
 
-    [OPPONENT_ANONYMOUS_9] =
+    [TRAINER_ANONYMOUS_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 }
     },
 
-    [OPPONENT_KATELYN_1] =
+    [TRAINER_KATELYN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 }
     },
 
-    [OPPONENT_ALLISON] =
+    [TRAINER_ALLISON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Allison
+        .party = {.NoItemDefaultMoves = gTrainerParty_Allison }
     },
 
-    [OPPONENT_KATELYN_2] =
+    [TRAINER_KATELYN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 }
     },
 
-    [OPPONENT_KATELYN_3] =
+    [TRAINER_KATELYN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 }
     },
 
-    [OPPONENT_KATELYN_4] =
+    [TRAINER_KATELYN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 }
     },
 
-    [OPPONENT_KATELYN_5] =
+    [TRAINER_KATELYN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
@@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Katelyn5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 }
     },
 
-    [OPPONENT_NICOLAS_1] =
+    [TRAINER_NICOLAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 }
     },
 
-    [OPPONENT_NICOLAS_2] =
+    [TRAINER_NICOLAS_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 }
     },
 
-    [OPPONENT_NICOLAS_3] =
+    [TRAINER_NICOLAS_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nicolas3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 }
     },
 
-    [OPPONENT_NICOLAS_4] =
+    [TRAINER_NICOLAS_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 }
     },
 
-    [OPPONENT_NICOLAS_5] =
+    [TRAINER_NICOLAS_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nicolas5
+        .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 }
     },
 
-    [OPPONENT_AARON] =
+    [TRAINER_AARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
@@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Aaron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aaron }
     },
 
-    [OPPONENT_PERRY] =
+    [TRAINER_PERRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Perry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Perry }
     },
 
-    [OPPONENT_HUGH] =
+    [TRAINER_HUGH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hugh
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hugh }
     },
 
-    [OPPONENT_PHIL] =
+    [TRAINER_PHIL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Phil
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phil }
     },
 
-    [OPPONENT_JARED] =
+    [TRAINER_JARED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jared
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jared }
     },
 
-    [OPPONENT_ANONYMOUS_10] =
+    [TRAINER_ANONYMOUS_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Anonymous10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 }
     },
 
-    [OPPONENT_TANNER] =
+    [TRAINER_TANNER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tanner
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanner }
     },
 
-    [OPPONENT_WILL] =
+    [TRAINER_WILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Will
+        .party = {.NoItemDefaultMoves = gTrainerParty_Will }
     },
 
-    [OPPONENT_COLIN] =
+    [TRAINER_COLIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Colin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Colin }
     },
 
-    [OPPONENT_ROBERT_1] =
+    [TRAINER_ROBERT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Robert1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 }
     },
 
-    [OPPONENT_BENNY] =
+    [TRAINER_BENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Benny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Benny }
     },
 
-    [OPPONENT_CHESTER] =
+    [TRAINER_CHESTER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Chester
+        .party = {.NoItemDefaultMoves = gTrainerParty_Chester }
     },
 
-    [OPPONENT_ROBERT_2] =
+    [TRAINER_ROBERT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 }
     },
 
-    [OPPONENT_ROBERT_3] =
+    [TRAINER_ROBERT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 }
     },
 
-    [OPPONENT_ROBERT_4] =
+    [TRAINER_ROBERT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 }
     },
 
-    [OPPONENT_ROBERT_5] =
+    [TRAINER_ROBERT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Robert5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 }
     },
 
-    [OPPONENT_ALEX] =
+    [TRAINER_ALEX] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Alex
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alex }
     },
 
-    [OPPONENT_BECK] =
+    [TRAINER_BECK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beck
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beck }
     },
 
-    [OPPONENT_YASU] =
+    [TRAINER_YASU] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 1,
-        .party = gTrainerParty_Yasu
+        .party = {.NoItemDefaultMoves = gTrainerParty_Yasu }
     },
 
-    [OPPONENT_TAKASHI] =
+    [TRAINER_TAKASHI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Takashi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Takashi }
     },
 
-    [OPPONENT_MAKOTO] =
+    [TRAINER_MAKOTO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 1,
-        .party = gTrainerParty_Makoto
+        .party = {.NoItemDefaultMoves = gTrainerParty_Makoto }
     },
 
-    [OPPONENT_HIDEO_1] =
+    [TRAINER_HIDEO_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Hideo1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 }
     },
 
-    [OPPONENT_LAO_1] =
+    [TRAINER_LAO_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao1
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao1 }
     },
 
-    [OPPONENT_LUNG] =
+    [TRAINER_LUNG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 2,
-        .party = gTrainerParty_Lung
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lung }
     },
 
-    [OPPONENT_LAO_2] =
+    [TRAINER_LAO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao2 }
     },
 
-    [OPPONENT_LAO_3] =
+    [TRAINER_LAO_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao3
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao3 }
     },
 
-    [OPPONENT_LAO_4] =
+    [TRAINER_LAO_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao4
+        .party = {.NoItemCustomMoves = gTrainerParty_Lao4 }
     },
 
-    [OPPONENT_LAO_5] =
+    [TRAINER_LAO_5] =
     {
         .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x0,
         .partySize = 4,
-        .party = gTrainerParty_Lao5
+        .party = {.ItemCustomMoves = gTrainerParty_Lao5 }
     },
 
-    [OPPONENT_TESSA] =
+    [TRAINER_TESSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tessa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tessa }
     },
 
-    [OPPONENT_LAURA] =
+    [TRAINER_LAURA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Laura
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laura }
     },
 
-    [OPPONENT_CYNDY_1] =
+    [TRAINER_CYNDY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 }
     },
 
-    [OPPONENT_CORA] =
+    [TRAINER_CORA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Cora
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cora }
     },
 
-    [OPPONENT_JILL] =
+    [TRAINER_JILL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jill
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jill }
     },
 
-    [OPPONENT_CYNDY_2] =
+    [TRAINER_CYNDY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 }
     },
 
-    [OPPONENT_CYNDY_3] =
+    [TRAINER_CYNDY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 }
     },
 
-    [OPPONENT_CYNDY_4] =
+    [TRAINER_CYNDY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 }
     },
 
-    [OPPONENT_CYNDY_5] =
+    [TRAINER_CYNDY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Cyndy5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 }
     },
 
-    [OPPONENT_MADELINE_1] =
+    [TRAINER_MADELINE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline1
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 }
     },
 
-    [OPPONENT_CLARISSA] =
+    [TRAINER_CLARISSA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Clarissa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa }
     },
 
-    [OPPONENT_ANGELICA] =
+    [TRAINER_ANGELICA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Angelica
+        .party = {.NoItemDefaultMoves = gTrainerParty_Angelica }
     },
 
-    [OPPONENT_MADELINE_2] =
+    [TRAINER_MADELINE_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline2
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 }
     },
 
-    [OPPONENT_MADELINE_3] =
+    [TRAINER_MADELINE_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Madeline3
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 }
     },
 
-    [OPPONENT_MADELINE_4] =
+    [TRAINER_MADELINE_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline4
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 }
     },
 
-    [OPPONENT_MADELINE_5] =
+    [TRAINER_MADELINE_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
@@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Madeline5
+        .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 }
     },
 
-    [OPPONENT_BEVERLY] =
+    [TRAINER_BEVERLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Beverly
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beverly }
     },
 
-    [OPPONENT_DAWN] =
+    [TRAINER_DAWN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Dawn
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dawn }
     },
 
-    [OPPONENT_NICOLE] =
+    [TRAINER_NICOLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Nicole
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nicole }
     },
 
-    [OPPONENT_DENISE] =
+    [TRAINER_DENISE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Denise
+        .party = {.NoItemDefaultMoves = gTrainerParty_Denise }
     },
 
-    [OPPONENT_BETH] =
+    [TRAINER_BETH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Beth
+        .party = {.NoItemDefaultMoves = gTrainerParty_Beth }
     },
 
-    [OPPONENT_TARA] =
+    [TRAINER_TARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tara }
     },
 
-    [OPPONENT_MISSY] =
+    [TRAINER_MISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Missy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Missy }
     },
 
-    [OPPONENT_ALICE] =
+    [TRAINER_ALICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alice }
     },
 
-    [OPPONENT_JENNY_1] =
+    [TRAINER_JENNY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 }
     },
 
-    [OPPONENT_GRACE] =
+    [TRAINER_GRACE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grace
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grace }
     },
 
-    [OPPONENT_TANYA] =
+    [TRAINER_TANYA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tanya
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tanya }
     },
 
-    [OPPONENT_SHARON] =
+    [TRAINER_SHARON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Sharon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sharon }
     },
 
-    [OPPONENT_NIKKI] =
+    [TRAINER_NIKKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Nikki
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nikki }
     },
 
-    [OPPONENT_BRENDA] =
+    [TRAINER_BRENDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Brenda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brenda }
     },
 
-    [OPPONENT_KATIE] =
+    [TRAINER_KATIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Katie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Katie }
     },
 
-    [OPPONENT_SUSIE] =
+    [TRAINER_SUSIE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Susie
+        .party = {.NoItemDefaultMoves = gTrainerParty_Susie }
     },
 
-    [OPPONENT_KARA] =
+    [TRAINER_KARA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kara
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kara }
     },
 
-    [OPPONENT_DANA] =
+    [TRAINER_DANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dana }
     },
 
-    [OPPONENT_ERIN] =
+    [TRAINER_ERIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Erin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Erin }
     },
 
-    [OPPONENT_DEBRA] =
+    [TRAINER_DEBRA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Debra
+        .party = {.NoItemDefaultMoves = gTrainerParty_Debra }
     },
 
-    [OPPONENT_LINDA] =
+    [TRAINER_LINDA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Linda
+        .party = {.NoItemDefaultMoves = gTrainerParty_Linda }
     },
 
-    [OPPONENT_KAYLEE] =
+    [TRAINER_KAYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kaylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee }
     },
 
-    [OPPONENT_LAUREL] =
+    [TRAINER_LAUREL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Laurel
+        .party = {.NoItemDefaultMoves = gTrainerParty_Laurel }
     },
 
-    [OPPONENT_DARCY] =
+    [TRAINER_DARCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Darcy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Darcy }
     },
 
-    [OPPONENT_JENNY_2] =
+    [TRAINER_JENNY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 }
     },
 
-    [OPPONENT_JENNY_3] =
+    [TRAINER_JENNY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Jenny3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 }
     },
 
-    [OPPONENT_JENNY_4] =
+    [TRAINER_JENNY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Jenny4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 }
     },
 
-    [OPPONENT_JENNY_5] =
+    [TRAINER_JENNY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jenny5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 }
     },
 
-    [OPPONENT_HEIDI] =
+    [TRAINER_HEIDI] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Heidi
+        .party = {.NoItemCustomMoves = gTrainerParty_Heidi }
     },
 
-    [OPPONENT_BECKY] =
+    [TRAINER_BECKY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Becky
+        .party = {.NoItemCustomMoves = gTrainerParty_Becky }
     },
 
-    [OPPONENT_CAROL] =
+    [TRAINER_CAROL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Carol
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carol }
     },
 
-    [OPPONENT_NANCY] =
+    [TRAINER_NANCY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nancy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nancy }
     },
 
-    [OPPONENT_MARTHA] =
+    [TRAINER_MARTHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Martha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Martha }
     },
 
-    [OPPONENT_DIANA_1] =
+    [TRAINER_DIANA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 }
     },
 
-    [OPPONENT_NINA] =
+    [TRAINER_NINA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Nina
+        .party = {.NoItemDefaultMoves = gTrainerParty_Nina }
     },
 
-    [OPPONENT_IRENE] =
+    [TRAINER_IRENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Irene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Irene }
     },
 
-    [OPPONENT_DIANA_2] =
+    [TRAINER_DIANA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 }
     },
 
-    [OPPONENT_DIANA_3] =
+    [TRAINER_DIANA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 }
     },
 
-    [OPPONENT_DIANA_4] =
+    [TRAINER_DIANA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 }
     },
 
-    [OPPONENT_DIANA_5] =
+    [TRAINER_DIANA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Diana5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_1] =
+    [TRAINER_AMY_AND_LIV_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv1
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 }
     },
 
-    [OPPONENT_AMY_AND_LIV_2] =
+    [TRAINER_AMY_AND_LIV_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv2
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 }
     },
 
-    [OPPONENT_GINA_AND_MIA_1] =
+    [TRAINER_GINA_AND_MIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 }
     },
 
-    [OPPONENT_MIU_AND_YUKI] =
+    [TRAINER_MIU_AND_YUKI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MiuAndYuki
+        .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki }
     },
 
-    [OPPONENT_AMY_AND_LIV_3] =
+    [TRAINER_AMY_AND_LIV_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv3
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 }
     },
 
-    [OPPONENT_GINA_AND_MIA_2] =
+    [TRAINER_GINA_AND_MIA_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_GinaAndMia2
+        .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 }
     },
 
-    [OPPONENT_AMY_AND_LIV_4] =
+    [TRAINER_AMY_AND_LIV_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv4
+        .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 }
     },
 
-    [OPPONENT_AMY_AND_LIV_5] =
+    [TRAINER_AMY_AND_LIV_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv5
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 }
     },
 
-    [OPPONENT_AMY_AND_LIV_6] =
+    [TRAINER_AMY_AND_LIV_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_AmyAndLiv6
+        .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 }
     },
 
-    [OPPONENT_HUEY] =
+    [TRAINER_HUEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Huey
+        .party = {.NoItemDefaultMoves = gTrainerParty_Huey }
     },
 
-    [OPPONENT_EDMOND] =
+    [TRAINER_EDMOND] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Edmond
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edmond }
     },
 
-    [OPPONENT_ERNEST_1] =
+    [TRAINER_ERNEST_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 }
     },
 
-    [OPPONENT_DWAYNE] =
+    [TRAINER_DWAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Dwayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne }
     },
 
-    [OPPONENT_PHILLIP] =
+    [TRAINER_PHILLIP] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Phillip
+        .party = {.NoItemDefaultMoves = gTrainerParty_Phillip }
     },
 
-    [OPPONENT_LEONARD] =
+    [TRAINER_LEONARD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Leonard
+        .party = {.NoItemDefaultMoves = gTrainerParty_Leonard }
     },
 
-    [OPPONENT_DUNCAN] =
+    [TRAINER_DUNCAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Duncan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Duncan }
     },
 
-    [OPPONENT_ERNEST_2] =
+    [TRAINER_ERNEST_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 }
     },
 
-    [OPPONENT_ERNEST_3] =
+    [TRAINER_ERNEST_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 }
     },
 
-    [OPPONENT_ERNEST_4] =
+    [TRAINER_ERNEST_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 }
     },
 
-    [OPPONENT_ERNEST_5] =
+    [TRAINER_ERNEST_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SAILOR,
@@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Ernest5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 }
     },
 
-    [OPPONENT_ANONYMOUS_11] =
+    [TRAINER_ANONYMOUS_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 }
     },
 
-    [OPPONENT_ANONYMOUS_12] =
+    [TRAINER_ANONYMOUS_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Anonymous12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 }
     },
 
-    [OPPONENT_ANONYMOUS_13] =
+    [TRAINER_ANONYMOUS_13] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Anonymous13
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 }
     },
 
-    [OPPONENT_SONNY] =
+    [TRAINER_SONNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sonny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sonny }
     },
 
-    [OPPONENT_DONOVAN] =
+    [TRAINER_DONOVAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Donovan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Donovan }
     },
 
-    [OPPONENT_GERALD] =
+    [TRAINER_GERALD] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Gerald
+        .party = {.NoItemDefaultMoves = gTrainerParty_Gerald }
     },
 
-    [OPPONENT_KELVIN] =
+    [TRAINER_KELVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Kelvin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin }
     },
 
-    [OPPONENT_KODY] =
+    [TRAINER_KODY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Kody
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kody }
     },
 
-    [OPPONENT_TEVIN] =
+    [TRAINER_TEVIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Tevin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tevin }
     },
 
-    [OPPONENT_DAMON] =
+    [TRAINER_DAMON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Damon
+        .party = {.NoItemDefaultMoves = gTrainerParty_Damon }
     },
 
-    [OPPONENT_PABLO] =
+    [TRAINER_PABLO] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BOARDER,
@@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Pablo
+        .party = {.NoItemDefaultMoves = gTrainerParty_Pablo }
     },
 
-    [OPPONENT_EDWIN_1] =
+    [TRAINER_EDWIN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 }
     },
 
-    [OPPONENT_HECTOR_1] =
+    [TRAINER_HECTOR_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 }
     },
 
-    [OPPONENT_HECTOR_2] =
+    [TRAINER_HECTOR_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Hector2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 }
     },
 
-    [OPPONENT_EDWIN_2] =
+    [TRAINER_EDWIN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 }
     },
 
-    [OPPONENT_EDWIN_3] =
+    [TRAINER_EDWIN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 }
     },
 
-    [OPPONENT_EDWIN_4] =
+    [TRAINER_EDWIN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 }
     },
 
-    [OPPONENT_EDWIN_5] =
+    [TRAINER_EDWIN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COLLECTOR,
@@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Edwin5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 }
     },
 
-    [OPPONENT_WALLY_1] =
+    [TRAINER_WALLY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally1
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally1 }
     },
 
-    [OPPONENT_BRENDAN_1] =
+    [TRAINER_BRENDAN_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 }
     },
 
-    [OPPONENT_BRENDAN_2] =
+    [TRAINER_BRENDAN_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 }
     },
 
-    [OPPONENT_BRENDAN_3] =
+    [TRAINER_BRENDAN_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 }
     },
 
-    [OPPONENT_BRENDAN_4] =
+    [TRAINER_BRENDAN_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Brendan4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 }
     },
 
-    [OPPONENT_BRENDAN_5] =
+    [TRAINER_BRENDAN_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 }
     },
 
-    [OPPONENT_BRENDAN_6] =
+    [TRAINER_BRENDAN_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan6
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 }
     },
 
-    [OPPONENT_BRENDAN_7] =
+    [TRAINER_BRENDAN_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Brendan7
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 }
     },
 
-    [OPPONENT_BRENDAN_8] =
+    [TRAINER_BRENDAN_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan8
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 }
     },
 
-    [OPPONENT_BRENDAN_9] =
+    [TRAINER_BRENDAN_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Brendan9
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 }
     },
 
-    [OPPONENT_MAY_1] =
+    [TRAINER_MAY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May1
+        .party = {.NoItemDefaultMoves = gTrainerParty_May1 }
     },
 
-    [OPPONENT_MAY_2] =
+    [TRAINER_MAY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May2
+        .party = {.NoItemDefaultMoves = gTrainerParty_May2 }
     },
 
-    [OPPONENT_MAY_3] =
+    [TRAINER_MAY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May3
+        .party = {.NoItemDefaultMoves = gTrainerParty_May3 }
     },
 
-    [OPPONENT_MAY_4] =
+    [TRAINER_MAY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May4
+        .party = {.NoItemDefaultMoves = gTrainerParty_May4 }
     },
 
-    [OPPONENT_MAY_5] =
+    [TRAINER_MAY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May5
+        .party = {.NoItemDefaultMoves = gTrainerParty_May5 }
     },
 
-    [OPPONENT_MAY_6] =
+    [TRAINER_MAY_6] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May6
+        .party = {.NoItemDefaultMoves = gTrainerParty_May6 }
     },
 
-    [OPPONENT_MAY_7] =
+    [TRAINER_MAY_7] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_May7
+        .party = {.NoItemDefaultMoves = gTrainerParty_May7 }
     },
 
-    [OPPONENT_MAY_8] =
+    [TRAINER_MAY_8] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May8
+        .party = {.NoItemDefaultMoves = gTrainerParty_May8 }
     },
 
-    [OPPONENT_MAY_9] =
+    [TRAINER_MAY_9] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_May9
+        .party = {.NoItemDefaultMoves = gTrainerParty_May9 }
     },
 
-    [OPPONENT_ISAAC_1] =
+    [TRAINER_ISAAC_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 }
     },
 
-    [OPPONENT_RILEY] =
+    [TRAINER_RILEY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Riley
+        .party = {.NoItemDefaultMoves = gTrainerParty_Riley }
     },
 
-    [OPPONENT_AIDAN] =
+    [TRAINER_AIDAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Aidan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Aidan }
     },
 
-    [OPPONENT_ISAAC_2] =
+    [TRAINER_ISAAC_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 }
     },
 
-    [OPPONENT_ISAAC_3] =
+    [TRAINER_ISAAC_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 }
     },
 
-    [OPPONENT_ISAAC_4] =
+    [TRAINER_ISAAC_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 }
     },
 
-    [OPPONENT_ISAAC_5] =
+    [TRAINER_ISAAC_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Isaac5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 }
     },
 
-    [OPPONENT_LYDIA_1] =
+    [TRAINER_LYDIA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 }
     },
 
-    [OPPONENT_ALEXIA] =
+    [TRAINER_ALEXIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Alexia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexia }
     },
 
-    [OPPONENT_DANIELLE] =
+    [TRAINER_DANIELLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Danielle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Danielle }
     },
 
-    [OPPONENT_LYDIA_2] =
+    [TRAINER_LYDIA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 }
     },
 
-    [OPPONENT_LYDIA_3] =
+    [TRAINER_LYDIA_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 }
     },
 
-    [OPPONENT_LYDIA_4] =
+    [TRAINER_LYDIA_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 }
     },
 
-    [OPPONENT_LYDIA_5] =
+    [TRAINER_LYDIA_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_BREEDER,
@@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lydia5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 }
     },
 
-    [OPPONENT_JACKSON_1] =
+    [TRAINER_JACKSON_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 }
     },
 
-    [OPPONENT_CARLOS] =
+    [TRAINER_CARLOS] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Carlos
+        .party = {.NoItemDefaultMoves = gTrainerParty_Carlos }
     },
 
-    [OPPONENT_SEBASTIAN] =
+    [TRAINER_SEBASTIAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Sebastian
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian }
     },
 
-    [OPPONENT_JACKSON_2] =
+    [TRAINER_JACKSON_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 }
     },
 
-    [OPPONENT_JACKSON_3] =
+    [TRAINER_JACKSON_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Jackson3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 }
     },
 
-    [OPPONENT_JACKSON_4] =
+    [TRAINER_JACKSON_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 1,
-        .party = gTrainerParty_Jackson4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 }
     },
 
-    [OPPONENT_JACKSON_5] =
+    [TRAINER_JACKSON_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Jackson5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 }
     },
 
-    [OPPONENT_CATHERINE_1] =
+    [TRAINER_CATHERINE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 }
     },
 
-    [OPPONENT_JENNA] =
+    [TRAINER_JENNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Jenna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jenna }
     },
 
-    [OPPONENT_SOPHIA] =
+    [TRAINER_SOPHIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Sophia
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sophia }
     },
 
-    [OPPONENT_CATHERINE_2] =
+    [TRAINER_CATHERINE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 }
     },
 
-    [OPPONENT_CATHERINE_3] =
+    [TRAINER_CATHERINE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 }
     },
 
-    [OPPONENT_CATHERINE_4] =
+    [TRAINER_CATHERINE_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Catherine4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 }
     },
 
-    [OPPONENT_CATHERINE_5] =
+    [TRAINER_CATHERINE_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_RANGER,
@@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Catherine5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 }
     },
 
-    [OPPONENT_MAXIE_1] =
+    [TRAINER_MAXIE_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Maxie1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 }
     },
 
-    [OPPONENT_GRUNT_28] =
+    [TRAINER_GRUNT_28] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt28
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 }
     },
 
-    [OPPONENT_GRUNT_29] =
+    [TRAINER_GRUNT_29] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Grunt29
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 }
     },
 
-    [OPPONENT_GRUNT_30] =
+    [TRAINER_GRUNT_30] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt30
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 }
     },
 
-    [OPPONENT_GRUNT_31] =
+    [TRAINER_GRUNT_31] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt31
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 }
     },
 
-    [OPPONENT_GRUNT_32] =
+    [TRAINER_GRUNT_32] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt32
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 }
     },
 
-    [OPPONENT_GRUNT_33] =
+    [TRAINER_GRUNT_33] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt33
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 }
     },
 
-    [OPPONENT_GRUNT_34] =
+    [TRAINER_GRUNT_34] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt34
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 }
     },
 
-    [OPPONENT_GRUNT_35] =
+    [TRAINER_GRUNT_35] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt35
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 }
     },
 
-    [OPPONENT_GRUNT_36] =
+    [TRAINER_GRUNT_36] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt36
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 }
     },
 
-    [OPPONENT_GRUNT_37] =
+    [TRAINER_GRUNT_37] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt37
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 }
     },
 
-    [OPPONENT_GRUNT_38] =
+    [TRAINER_GRUNT_38] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt38
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 }
     },
 
-    [OPPONENT_GRUNT_39] =
+    [TRAINER_GRUNT_39] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt39
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 }
     },
 
-    [OPPONENT_GRUNT_40] =
+    [TRAINER_GRUNT_40] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt40
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 }
     },
 
-    [OPPONENT_GRUNT_41] =
+    [TRAINER_GRUNT_41] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt41
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 }
     },
 
-    [OPPONENT_GRUNT_42] =
+    [TRAINER_GRUNT_42] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt42
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 }
     },
 
-    [OPPONENT_GRUNT_43] =
+    [TRAINER_GRUNT_43] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt43
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 }
     },
 
-    [OPPONENT_GRUNT_44] =
+    [TRAINER_GRUNT_44] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt44
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 }
     },
 
-    [OPPONENT_GRUNT_45] =
+    [TRAINER_GRUNT_45] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt45
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 }
     },
 
-    [OPPONENT_GRUNT_46] =
+    [TRAINER_GRUNT_46] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt46
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 }
     },
 
-    [OPPONENT_GRUNT_47] =
+    [TRAINER_GRUNT_47] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt47
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 }
     },
 
-    [OPPONENT_GRUNT_48] =
+    [TRAINER_GRUNT_48] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt48
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 }
     },
 
-    [OPPONENT_GRUNT_49] =
+    [TRAINER_GRUNT_49] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt49
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 }
     },
 
-    [OPPONENT_GRUNT_50] =
+    [TRAINER_GRUNT_50] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt50
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 }
     },
 
-    [OPPONENT_GRUNT_51] =
+    [TRAINER_GRUNT_51] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Grunt51
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 }
     },
 
-    [OPPONENT_GRUNT_52] =
+    [TRAINER_GRUNT_52] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt52
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 }
     },
 
-    [OPPONENT_GRUNT_53] =
+    [TRAINER_GRUNT_53] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Grunt53
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 }
     },
 
-    [OPPONENT_GRUNT_54] =
+    [TRAINER_GRUNT_54] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
@@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Grunt54
+        .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 }
     },
 
-    [OPPONENT_ANONYMOUS_14] =
+    [TRAINER_ANONYMOUS_14] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous14
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 }
     },
 
-    [OPPONENT_ANONYMOUS_15] =
+    [TRAINER_ANONYMOUS_15] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous15
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 }
     },
 
-    [OPPONENT_TABITHA_1] =
+    [TRAINER_TABITHA_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 }
     },
 
-    [OPPONENT_TABITHA_2] =
+    [TRAINER_TABITHA_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Tabitha2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 }
     },
 
-    [OPPONENT_ANONYMOUS_16] =
+    [TRAINER_ANONYMOUS_16] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Anonymous16
+        .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 }
     },
 
-    [OPPONENT_COURTNEY_1] =
+    [TRAINER_COURTNEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Courtney1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 }
     },
 
-    [OPPONENT_COURTNEY_2] =
+    [TRAINER_COURTNEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_Courtney2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 }
     },
 
-    [OPPONENT_MAXIE_2] =
+    [TRAINER_MAXIE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 }
     },
 
-    [OPPONENT_MAXIE_3] =
+    [TRAINER_MAXIE_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Maxie3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 }
     },
 
-    [OPPONENT_TIANA] =
+    [TRAINER_TIANA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Tiana
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tiana }
     },
 
-    [OPPONENT_HALEY_1] =
+    [TRAINER_HALEY_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 }
     },
 
-    [OPPONENT_JANICE] =
+    [TRAINER_JANICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Janice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Janice }
     },
 
-    [OPPONENT_VIVI] =
+    [TRAINER_VIVI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_WINSTRATE,
@@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Vivi
+        .party = {.NoItemDefaultMoves = gTrainerParty_Vivi }
     },
 
-    [OPPONENT_HALEY_2] =
+    [TRAINER_HALEY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 }
     },
 
-    [OPPONENT_HALEY_3] =
+    [TRAINER_HALEY_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 }
     },
 
-    [OPPONENT_HALEY_4] =
+    [TRAINER_HALEY_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Haley4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 }
     },
 
-    [OPPONENT_HALEY_5] =
+    [TRAINER_HALEY_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Haley5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 }
     },
 
-    [OPPONENT_SALLY] =
+    [TRAINER_SALLY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sally
+        .party = {.NoItemDefaultMoves = gTrainerParty_Sally }
     },
 
-    [OPPONENT_ROBIN] =
+    [TRAINER_ROBIN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Robin
+        .party = {.NoItemDefaultMoves = gTrainerParty_Robin }
     },
 
-    [OPPONENT_ANDREA] =
+    [TRAINER_ANDREA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Andrea
+        .party = {.NoItemDefaultMoves = gTrainerParty_Andrea }
     },
 
-    [OPPONENT_CRISSY] =
+    [TRAINER_CRISSY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_LASS,
@@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Crissy
+        .party = {.NoItemDefaultMoves = gTrainerParty_Crissy }
     },
 
-    [OPPONENT_RICK] =
+    [TRAINER_RICK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Rick
+        .party = {.NoItemDefaultMoves = gTrainerParty_Rick }
     },
 
-    [OPPONENT_LYLE] =
+    [TRAINER_LYLE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 6,
-        .party = gTrainerParty_Lyle
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lyle }
     },
 
-    [OPPONENT_JOSE] =
+    [TRAINER_JOSE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Jose
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jose }
     },
 
-    [OPPONENT_DOUG] =
+    [TRAINER_DOUG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Doug
+        .party = {.NoItemDefaultMoves = gTrainerParty_Doug }
     },
 
-    [OPPONENT_GREG] =
+    [TRAINER_GREG] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Greg
+        .party = {.NoItemDefaultMoves = gTrainerParty_Greg }
     },
 
-    [OPPONENT_KENT] =
+    [TRAINER_KENT] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kent
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kent }
     },
 
-    [OPPONENT_JAMES_1] =
+    [TRAINER_JAMES_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James1
+        .party = {.NoItemDefaultMoves = gTrainerParty_James1 }
     },
 
-    [OPPONENT_JAMES_2] =
+    [TRAINER_JAMES_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_James2
+        .party = {.NoItemDefaultMoves = gTrainerParty_James2 }
     },
 
-    [OPPONENT_JAMES_3] =
+    [TRAINER_JAMES_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_James3
+        .party = {.NoItemDefaultMoves = gTrainerParty_James3 }
     },
 
-    [OPPONENT_JAMES_4] =
+    [TRAINER_JAMES_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_James4
+        .party = {.NoItemDefaultMoves = gTrainerParty_James4 }
     },
 
-    [OPPONENT_JAMES_5] =
+    [TRAINER_JAMES_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
@@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_James5
+        .party = {.NoItemDefaultMoves = gTrainerParty_James5 }
     },
 
-    [OPPONENT_BRICE] =
+    [TRAINER_BRICE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Brice
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brice }
     },
 
-    [OPPONENT_TRENT_1] =
+    [TRAINER_TRENT_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 }
     },
 
-    [OPPONENT_LENNY] =
+    [TRAINER_LENNY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Lenny
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lenny }
     },
 
-    [OPPONENT_LUCAS_1] =
+    [TRAINER_LUCAS_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Lucas1
+        .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 }
     },
 
-    [OPPONENT_ALAN] =
+    [TRAINER_ALAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Alan
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alan }
     },
 
-    [OPPONENT_CLARK] =
+    [TRAINER_CLARK] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Clark
+        .party = {.NoItemDefaultMoves = gTrainerParty_Clark }
     },
 
-    [OPPONENT_ERIC] =
+    [TRAINER_ERIC] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Eric
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eric }
     },
 
-    [OPPONENT_LUCAS_2] =
+    [TRAINER_LUCAS_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Lucas2
+        .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 }
     },
 
-    [OPPONENT_MIKE_1] =
+    [TRAINER_MIKE_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Mike1
+        .party = {.NoItemCustomMoves = gTrainerParty_Mike1 }
     },
 
-    [OPPONENT_MIKE_2] =
+    [TRAINER_MIKE_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Mike2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 }
     },
 
-    [OPPONENT_TRENT_2] =
+    [TRAINER_TRENT_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 }
     },
 
-    [OPPONENT_TRENT_3] =
+    [TRAINER_TRENT_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent3
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 }
     },
 
-    [OPPONENT_TRENT_4] =
+    [TRAINER_TRENT_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent4
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 }
     },
 
-    [OPPONENT_TRENT_5] =
+    [TRAINER_TRENT_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_HIKER,
@@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Trent5
+        .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 }
     },
 
-    [OPPONENT_DEZ_AND_LUKE] =
+    [TRAINER_DEZ_AND_LUKE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_DezAndLuke
+        .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke }
     },
 
-    [OPPONENT_LEA_AND_JED] =
+    [TRAINER_LEA_AND_JED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LeaAndJed
+        .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed }
     },
 
-    [OPPONENT_LOIS_AND_HAL_1] =
+    [TRAINER_LOIS_AND_HAL_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal1
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_2] =
+    [TRAINER_LOIS_AND_HAL_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal2
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_3] =
+    [TRAINER_LOIS_AND_HAL_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal3
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_4] =
+    [TRAINER_LOIS_AND_HAL_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal4
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 }
     },
 
-    [OPPONENT_LOIS_AND_HAL_5] =
+    [TRAINER_LOIS_AND_HAL_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LoisAndHal5
+        .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 }
     },
 
-    [OPPONENT_JOHANNA] =
+    [TRAINER_JOHANNA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BEAUTY,
@@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Johanna
+        .party = {.NoItemDefaultMoves = gTrainerParty_Johanna }
     },
 
-    [OPPONENT_ZANE] =
+    [TRAINER_ZANE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Zane
+        .party = {.NoItemCustomMoves = gTrainerParty_Zane }
     },
 
-    [OPPONENT_VIVIAN] =
+    [TRAINER_VIVIAN] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Vivian
+        .party = {.NoItemCustomMoves = gTrainerParty_Vivian }
     },
 
-    [OPPONENT_SADIE] =
+    [TRAINER_SADIE] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
@@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Sadie
+        .party = {.NoItemCustomMoves = gTrainerParty_Sadie }
     },
 
-    [OPPONENT_HIDEO_2] =
+    [TRAINER_HIDEO_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Hideo2
+        .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 }
     },
 
-    [OPPONENT_KEIGO] =
+    [TRAINER_KEIGO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 2,
-        .party = gTrainerParty_Keigo
+        .party = {.NoItemCustomMoves = gTrainerParty_Keigo }
     },
 
-    [OPPONENT_TSUNAO] =
+    [TRAINER_TSUNAO] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
@@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x3,
         .partySize = 3,
-        .party = gTrainerParty_Tsunao
+        .party = {.NoItemCustomMoves = gTrainerParty_Tsunao }
     },
 
-    [OPPONENT_TERRELL] =
+    [TRAINER_TERRELL] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_CAMPER,
@@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Terrell
+        .party = {.NoItemDefaultMoves = gTrainerParty_Terrell }
     },
 
-    [OPPONENT_KYLEE] =
+    [TRAINER_KYLEE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_PICNICKER,
@@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 1,
-        .party = gTrainerParty_Kylee
+        .party = {.NoItemDefaultMoves = gTrainerParty_Kylee }
     },
 
-    [OPPONENT_WALLY_2] =
+    [TRAINER_WALLY_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 1,
-        .party = gTrainerParty_Wally2
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 }
     },
 
-    [OPPONENT_WALLY_3] =
+    [TRAINER_WALLY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally3
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally3 }
     },
 
-    [OPPONENT_WALLY_4] =
+    [TRAINER_WALLY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally4
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally4 }
     },
 
-    [OPPONENT_WALLY_5] =
+    [TRAINER_WALLY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally5
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally5 }
     },
 
-    [OPPONENT_WALLY_6] =
+    [TRAINER_WALLY_6] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 5,
-        .party = gTrainerParty_Wally6
+        .party = {.NoItemCustomMoves = gTrainerParty_Wally6 }
     },
 
-    [OPPONENT_BRENDAN_10] =
+    [TRAINER_BRENDAN_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan10
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 }
     },
 
-    [OPPONENT_BRENDAN_11] =
+    [TRAINER_BRENDAN_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan11
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 }
     },
 
-    [OPPONENT_BRENDAN_12] =
+    [TRAINER_BRENDAN_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_Brendan12
+        .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 }
     },
 
-    [OPPONENT_MAY_10] =
+    [TRAINER_MAY_10] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May10
+        .party = {.NoItemDefaultMoves = gTrainerParty_May10 }
     },
 
-    [OPPONENT_MAY_11] =
+    [TRAINER_MAY_11] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May11
+        .party = {.NoItemDefaultMoves = gTrainerParty_May11 }
     },
 
-    [OPPONENT_MAY_12] =
+    [TRAINER_MAY_12] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3,
@@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 4,
-        .party = gTrainerParty_May12
+        .party = {.NoItemDefaultMoves = gTrainerParty_May12 }
     },
 
-    [OPPONENT_JONAH] =
+    [TRAINER_JONAH] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Jonah
+        .party = {.NoItemDefaultMoves = gTrainerParty_Jonah }
     },
 
-    [OPPONENT_HENRY] =
+    [TRAINER_HENRY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Henry
+        .party = {.NoItemDefaultMoves = gTrainerParty_Henry }
     },
 
-    [OPPONENT_ROGER] =
+    [TRAINER_ROGER] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Roger
+        .party = {.NoItemDefaultMoves = gTrainerParty_Roger }
     },
 
-    [OPPONENT_ALEXA] =
+    [TRAINER_ALEXA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_Alexa
+        .party = {.NoItemDefaultMoves = gTrainerParty_Alexa }
     },
 
-    [OPPONENT_RUBEN] =
+    [TRAINER_RUBEN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_COOL_TRAINER,
@@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x7,
         .partySize = 3,
-        .party = gTrainerParty_Ruben
+        .party = {.NoItemDefaultMoves = gTrainerParty_Ruben }
     },
 
-    [OPPONENT_KOJI] =
+    [TRAINER_KOJI] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
@@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Koji
+        .party = {.NoItemDefaultMoves = gTrainerParty_Koji }
     },
 
-    [OPPONENT_WAYNE] =
+    [TRAINER_WAYNE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Wayne
+        .party = {.NoItemDefaultMoves = gTrainerParty_Wayne }
     },
 
-    [OPPONENT_BYRON] =
+    [TRAINER_BYRON] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
@@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_Byron
+        .party = {.NoItemDefaultMoves = gTrainerParty_Byron }
     },
 
-    [OPPONENT_REED] =
+    [TRAINER_REED] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
@@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Reed
+        .party = {.NoItemDefaultMoves = gTrainerParty_Reed }
     },
 
-    [OPPONENT_TISHA] =
+    [TRAINER_TISHA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
@@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 3,
-        .party = gTrainerParty_Tisha
+        .party = {.NoItemDefaultMoves = gTrainerParty_Tisha }
     },
 
-    [OPPONENT_TORI_AND_TIA] =
+    [TRAINER_TORI_AND_TIA] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_TWINS,
@@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ToriAndTia
+        .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia }
     },
 
-    [OPPONENT_KIM_AND_IRIS] =
+    [TRAINER_KIM_AND_IRIS] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_KimAndIris
+        .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris }
     },
 
-    [OPPONENT_TYRA_AND_IVY] =
+    [TRAINER_TYRA_AND_IVY] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
@@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_TyraAndIvy
+        .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy }
     },
 
-    [OPPONENT_MEL_AND_PAUL] =
+    [TRAINER_MEL_AND_PAUL] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
@@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_MelAndPaul
+        .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul }
     },
 
-    [OPPONENT_JOHN_AND_JAY_1] =
+    [TRAINER_JOHN_AND_JAY_1] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay1
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_2] =
+    [TRAINER_JOHN_AND_JAY_2] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay2
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_3] =
+    [TRAINER_JOHN_AND_JAY_3] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay3
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_4] =
+    [TRAINER_JOHN_AND_JAY_4] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0xb,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay4
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 }
     },
 
-    [OPPONENT_JOHN_AND_JAY_5] =
+    [TRAINER_JOHN_AND_JAY_5] =
     {
         .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
@@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x7,
         .partySize = 2,
-        .party = gTrainerParty_JohnAndJay5
+        .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 }
     },
 
-    [OPPONENT_RELI_AND_IAN] =
+    [TRAINER_RELI_AND_IAN] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_ReliAndIan
+        .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan }
     },
 
-    [OPPONENT_RITA_AND_SAM_1] =
+    [TRAINER_RITA_AND_SAM_1] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam1
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 }
     },
 
-    [OPPONENT_RITA_AND_SAM_2] =
+    [TRAINER_RITA_AND_SAM_2] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam2
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 }
     },
 
-    [OPPONENT_RITA_AND_SAM_3] =
+    [TRAINER_RITA_AND_SAM_3] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam3
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 }
     },
 
-    [OPPONENT_RITA_AND_SAM_4] =
+    [TRAINER_RITA_AND_SAM_4] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam4
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 }
     },
 
-    [OPPONENT_RITA_AND_SAM_5] =
+    [TRAINER_RITA_AND_SAM_5] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_RitaAndSam5
+        .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 }
     },
 
-    [OPPONENT_LISA_AND_RAY] =
+    [TRAINER_LISA_AND_RAY] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
@@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = TRUE,
         .aiFlags = 0x1,
         .partySize = 2,
-        .party = gTrainerParty_LisaAndRay
+        .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay }
     },
 
-    [OPPONENT_EUGENE] =
+    [TRAINER_EUGENE] =
     {
         .partyFlags = 0,
         .trainerClass = TRAINER_CLASS_FISHERMAN,
@@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = {
         .doubleBattle = FALSE,
         .aiFlags = 0x1,
         .partySize = 4,
-        .party = gTrainerParty_Eugene
+        .party = {.NoItemDefaultMoves = gTrainerParty_Eugene }
     },
 };
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index c5f6fc0ec..6b30fe5fe 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -707,19 +707,19 @@ bool8 TayaDebugMenu_Trainer(void)
     for (i = 0; i < ARRAY_COUNT(gTrainerEyeTrainers); i++)
         SetTrainerFlag(gTrainerEyeTrainers[i].opponentIDs[0]);
 
-    SetTrainerFlag(OPPONENT_ROXANNE);
-    SetTrainerFlag(OPPONENT_BRAWLY);
-    SetTrainerFlag(OPPONENT_WATTSON);
-    SetTrainerFlag(OPPONENT_FLANNERY);
-    SetTrainerFlag(OPPONENT_NORMAN);
-    SetTrainerFlag(OPPONENT_WINONA);
-    SetTrainerFlag(OPPONENT_TATE_AND_LIZA);
-    SetTrainerFlag(OPPONENT_WALLACE);
-    SetTrainerFlag(OPPONENT_SIDNEY);
-    SetTrainerFlag(OPPONENT_PHOEBE);
-    SetTrainerFlag(OPPONENT_GLACIA);
-    SetTrainerFlag(OPPONENT_DRAKE);
-    SetTrainerFlag(OPPONENT_STEVEN);
+    SetTrainerFlag(TRAINER_ROXANNE);
+    SetTrainerFlag(TRAINER_BRAWLY);
+    SetTrainerFlag(TRAINER_WATTSON);
+    SetTrainerFlag(TRAINER_FLANNERY);
+    SetTrainerFlag(TRAINER_NORMAN);
+    SetTrainerFlag(TRAINER_WINONA);
+    SetTrainerFlag(TRAINER_TATE_AND_LIZA);
+    SetTrainerFlag(TRAINER_WALLACE);
+    SetTrainerFlag(TRAINER_SIDNEY);
+    SetTrainerFlag(TRAINER_PHOEBE);
+    SetTrainerFlag(TRAINER_GLACIA);
+    SetTrainerFlag(TRAINER_DRAKE);
+    SetTrainerFlag(TRAINER_STEVEN);
     CloseMenu();
     return TRUE;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 580ec6886..6dc55ef28 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -7,6 +7,7 @@
 #include "constants/items.h"
 #include "main.h"
 #include "menu.h"
+#include "name_string_util.h"
 #include "naming_screen.h"
 #include "overworld.h"
 #include "palette.h"
@@ -310,88 +311,29 @@ void ScriptHatchMon(void)
     AddHatchedMonToParty(gSpecialVar_0x8004);
 }
 
-#ifdef NONMATCHING
-static bool8 sub_8042ABC(void* a, u8 b)
+static bool8 DaycareMonReceivedMail_(struct DayCare *daycare, u8 slot)
 {
+    u8 monNickname[32];
+    GetBoxMonNick(&daycare->mons[slot], monNickname);
+    if (daycare->misc.mail[slot].message.itemId != ITEM_NONE)
+    {
+        if (StringCompareWithoutExtCtrlCodes(monNickname, daycare->misc.mail[slot].names + 8)
+         || StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, daycare->misc.mail[slot].names))
+        {
+            StringCopy(gStringVar1, monNickname);
+            StringCopy(gStringVar2, daycare->misc.mail[slot].names);
+            StringCopy(gStringVar3, daycare->misc.mail[slot].names + 8);
+            SanitizeNameString(gStringVar2);
+            return TRUE;
+        }
+    }
 
+    return FALSE;
 }
 
-#else
-NAKED
-static bool8 sub_8042ABC(void* a, u8 b)
-{
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    sub sp, 0x20\n\
-    adds r5, r0, 0\n\
-    lsls r4, r1, 24\n\
-    lsrs r4, 24\n\
-    lsls r0, r4, 2\n\
-    adds r0, r4\n\
-    lsls r0, 4\n\
-    adds r0, r5, r0\n\
-    mov r1, sp\n\
-    bl GetBoxMonNick\n\
-    lsls r0, r4, 3\n\
-    subs r0, r4\n\
-    lsls r1, r0, 3\n\
-    adds r0, r5, r1\n\
-    adds r0, 0xC0\n\
-    ldrh r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _08042B40\n\
-    adds r0, r1, 0\n\
-    adds r0, 0xA0\n\
-    adds r5, r0\n\
-    adds r6, r5, 0\n\
-    adds r6, 0x2C\n\
-    mov r0, sp\n\
-    adds r1, r6, 0\n\
-    bl StringCompareWithoutExtCtrlCodes\n\
-    cmp r0, 0\n\
-    bne _08042B08\n\
-    ldr r0, _08042B30 @ =gSaveBlock2\n\
-    adds r1, r5, 0\n\
-    adds r1, 0x24\n\
-    bl StringCompareWithoutExtCtrlCodes\n\
-    cmp r0, 0\n\
-    beq _08042B40\n\
-_08042B08:\n\
-    ldr r0, _08042B34 @ =gStringVar1\n\
-    mov r1, sp\n\
-    bl StringCopy\n\
-    ldr r4, _08042B38 @ =gStringVar2\n\
-    adds r1, r5, 0\n\
-    adds r1, 0x24\n\
-    adds r0, r4, 0\n\
-    bl StringCopy\n\
-    ldr r0, _08042B3C @ =gStringVar3\n\
-    adds r1, r6, 0\n\
-    bl StringCopy\n\
-    adds r0, r4, 0\n\
-    bl SanitizeNameString\n\
-    movs r0, 0x1\n\
-    b _08042B42\n\
-    .align 2, 0\n\
-_08042B30: .4byte gSaveBlock2\n\
-_08042B34: .4byte gStringVar1\n\
-_08042B38: .4byte gStringVar2\n\
-_08042B3C: .4byte gStringVar3\n\
-_08042B40:\n\
-    movs r0, 0\n\
-_08042B42:\n\
-    add sp, 0x20\n\
-    pop {r4-r6}\n\
-    pop {r1}\n\
-    bx r1\n\
-        .syntax divided");
-}
-
-#endif // NONMATCHING
-
-bool8 sub_8042B4C(void)
+bool8 DaycareMonReceivedMail(void)
 {
-    return sub_8042ABC(&gSaveBlock1.daycare, gSpecialVar_0x8004);
+    return DaycareMonReceivedMail_(&gSaveBlock1.daycare, gSpecialVar_0x8004);
 }
 
 static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID)
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 5d498c1ff..c8685bb49 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -15,6 +15,7 @@
 #include "trainer_see.h"
 #include "constants/field_effects.h"
 #include "constants/maps.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index ffdf926f5..7a438e100 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -24,6 +24,8 @@
 #include "trainer_see.h"
 #include "constants/vars.h"
 #include "wild_encounter.h"
+#include "constants/bg_event_constants.h"
+#include "constants/map_types.h"
 
 struct Coords32
 {
@@ -409,34 +411,34 @@ static u8 *GetInteractedBackgroundEventScript(struct MapPosition *position, u8 m
 
     switch (bgEvent->kind)
     {
-    case 0:
+    case BG_EVENT_PLAYER_FACING_ANY:
     default:
         return bgEvent->bgUnion.script;
-    case 1:
+    case BG_EVENT_PLAYER_FACING_NORTH:
         if (direction != DIR_NORTH)
             return NULL;
         break;
-    case 2:
+    case BG_EVENT_PLAYER_FACING_SOUTH:
         if (direction != DIR_SOUTH)
             return NULL;
         break;
-    case 3:
+    case BG_EVENT_PLAYER_FACING_EAST:
         if (direction != DIR_EAST)
             return NULL;
         break;
-    case 4:
+    case BG_EVENT_PLAYER_FACING_WEST:
         if (direction != DIR_WEST)
             return NULL;
         break;
     case 5:
     case 6:
-    case 7:
+    case BG_EVENT_HIDDEN_ITEM:
         gSpecialVar_0x8004 = ((u32)bgEvent->bgUnion.script >> 16) + FLAG_HIDDEN_ITEMS_START;
         gSpecialVar_0x8005 = (u32)bgEvent->bgUnion.script;
         if (FlagGet(gSpecialVar_0x8004) == TRUE)
             return NULL;
         return HiddenItemScript;
-    case 8:
+    case BG_EVENT_SECRET_BASE:
         if (direction == DIR_NORTH)
         {
             gSpecialVar_0x8004 = bgEvent->bgUnion.secretBaseId;
diff --git a/src/field_effect.c b/src/field_effect.c
index 90c11b8c3..cc5f9252a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -24,6 +24,7 @@
 #include "fieldmap.h"
 #include "util.h"
 #include "pokemon_storage_system.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index c52dc98c6..670d8c54b 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -16,10 +16,11 @@
 #include "palette.h"
 #include "overworld.h"
 #include "script.h"
-#include "constants/songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/songs.h"
 
 void sub_8080B9C(u8);
 void task_map_chg_seq_0807E20C(u8);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 9a4f5f6cd..47f43858b 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -22,6 +22,7 @@
 #include "tv.h"
 #include "wild_encounter.h"
 #include "constants/field_effects.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 
 EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0};
diff --git a/src/field_specials.c b/src/field_specials.c
index e8c83b376..043945a2f 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -18,10 +18,6 @@
 #include "string_util.h"
 #include "strings.h"
 #include "pokeblock.h"
-#include "constants/species.h"
-#include "constants/abilities.h"
-#include "constants/moves.h"
-#include "constants/weather.h"
 #include "text.h"
 #include "wallclock.h"
 #include "tv.h"
@@ -36,6 +32,11 @@
 #include "field_weather.h"
 #include "pokemon_summary_screen.h"
 #include "random.h"
+#include "constants/abilities.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+#include "constants/weather.h"
 
 #if ENGLISH
 #define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 5a04f7061..22da8e501 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -7,10 +7,11 @@
 #include "overworld.h"
 #include "rom6.h"
 #include "script.h"
-#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "constants/map_types.h"
+#include "constants/songs.h"
 
 struct MapTypeFadePairs
 {
diff --git a/src/heal_location.c b/src/heal_location.c
index 4c78f5921..3bb24e1a1 100644
--- a/src/heal_location.c
+++ b/src/heal_location.c
@@ -1,32 +1,7 @@
 #include "global.h"
 #include "heal_location.h"
 #include "constants/maps.h"
-
-static const struct HealLocation sHealLocations[] =
-{
-    {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2},
-    {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2},
-    {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17},
-    {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 19, 20},
-    {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 22, 6},
-    {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 16, 39},
-    {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 5, 7},
-    {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 24, 15},
-    {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 28, 17},
-    {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 43, 32},
-    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 27, 49},
-    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 5, 9},
-    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 14, 9},
-    {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 6, 17},
-    {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 2, 11},
-    {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 9, 7},
-    {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 14, 8},
-    {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 16, 4},
-    {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 8, 16},
-    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 18, 6},
-    {MAP_GROUP(BATTLE_TOWER_OUTSIDE), MAP_NUM(BATTLE_TOWER_OUTSIDE), 14, 9},
-    {MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR), 15, 20},
-};
+#include "data/heal_locations.h"
 
 u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum)
 {
diff --git a/src/item_menu.c b/src/item_menu.c
index 71516c0a4..12d02ebd8 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -538,7 +538,7 @@ static bool8 LoadBagGraphicsMultistep(void)
         ewramBagSetupStep++;
         break;
     case 1:
-        CpuCopy16(gUnknown_08E77004, gBGTilemapBuffers[2], 0x800);
+        CpuCopy16(gBagScreen_Tilemap, gBGTilemapBuffers[2], 0x800);
         ewramBagSetupStep++;
         break;
     case 2:
@@ -742,7 +742,7 @@ static void sub_80A37F8(u8 taskId)
 
 static void sub_80A3954(u16 *a)
 {
-    CpuCopy16(gUnknown_08E77004, a, 0x800);
+    CpuCopy16(gBagScreen_Tilemap, a, 0x800);
 }
 
 static void sub_80A396C(u16 *a, u8 b, u8 c, u8 d)
@@ -762,7 +762,7 @@ static void sub_80A39B8(u16 *a, u8 b)
 {
     u8 var = b * 2;
 
-    sub_809D104(a, 4, 10, gUnknown_08E96EC8, 0, var, 8, 2);
+    sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 0, var, 8, 2);
 }
 
 static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
@@ -776,8 +776,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
         if (b == 5)
             r7 = 2;
 
-        sub_809D104(a, 4, 10, gUnknown_08E96EC8, 8 - c, r2, c, 2);
-        sub_809D104(a, c + 4, 10, gUnknown_08E96EC8, 0, r7, 8 - c, 2);
+        sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 8 - c, r2, c, 2);
+        sub_809D104(a, c + 4, 10, gBagScreenLabels_Tilemap, 0, r7, 8 - c, 2);
     }
     else if (d == 1)
     {
@@ -785,8 +785,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d)
         if (b == 1)
             r7 = 10;
 
-        sub_809D104(a, 4, 10, gUnknown_08E96EC8, c, r7, 8 - c, 2);
-        sub_809D104(a, 12 - c, 10, gUnknown_08E96EC8, 0, r2, c, 2);
+        sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, c, r7, 8 - c, 2);
+        sub_809D104(a, 12 - c, 10, gBagScreenLabels_Tilemap, 0, r2, c, 2);
     }
 }
 
@@ -4024,7 +4024,7 @@ static int sub_80A7988(void)
 }
 
 static const u16 gPalette_83C170C[] = INCBIN_U16("graphics/unknown/83C170C.gbapal");
-static const u8 gSpriteImage_83C172C[] = INCBIN_U8("graphics/unknown_sprites/83C172C.4bpp");
+static const u8 gSpriteImage_BagSpinner[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp");
 
 const u8 gSpriteImage_UnusedCherry[] = INCBIN_U8("graphics/unused/cherry.4bpp");
 const u16 gSpritePalette_UnusedCherry[] = INCBIN_U16("graphics/unused/cherry.gbapal");
@@ -4258,7 +4258,7 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_83C1D20[] =
 
 static const struct SpriteFrameImage gSpriteImageTable_83C1D28[] =
 {
-    {gSpriteImage_83C172C, sizeof(gSpriteImage_83C172C)},
+    {gSpriteImage_BagSpinner, sizeof(gSpriteImage_BagSpinner)},
 };
 
 static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8};
diff --git a/src/item_use.c b/src/item_use.c
index 4e76ea434..1f33144b2 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -34,6 +34,8 @@
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
+#include "constants/bg_event_constants.h"
+#include "constants/map_types.h"
 #include "constants/species.h"
 #include "constants/vars.h"
 
@@ -335,12 +337,12 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
 
     for (i = 0; i < events->bgEventCount; i++)
     {
-        if ((events -> bgEvents[i].kind == 7) && !FlagGet(events -> bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START))
+        if ((events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM) && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START))
         {
             // do a distance lookup of each item so long as the index remains less than the objects on the current map.
-            distanceX = (u16)events -> bgEvents[i].x + 7;
+            distanceX = (u16)events->bgEvents[i].x + 7;
             newDistanceX = distanceX - x;
-            distanceY = (u16)events -> bgEvents[i].y + 7;
+            distanceY = (u16)events->bgEvents[i].y + 7;
             newDistanceY = distanceY - y;
 
             // is item in range?
@@ -365,7 +367,7 @@ bool8 HiddenItemAtPos(struct MapEvents *events, s16 x, s16 y)
 
     for (i = 0; i < bgEventCount; i++)
     {
-        if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
+        if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
         {
             if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + FLAG_HIDDEN_ITEMS_START))
                 return TRUE;
diff --git a/src/load_save.c b/src/load_save.c
index 7960a42eb..a1ca7ce76 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -67,7 +67,7 @@ void SavePlayerParty(void)
 
     gSaveBlock1.playerPartyCount = gPlayerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gSaveBlock1.playerParty[i] = gPlayerParty[i];
 }
 
@@ -77,7 +77,7 @@ void LoadPlayerParty(void)
 
     gPlayerPartyCount = gSaveBlock1.playerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gPlayerParty[i] = gSaveBlock1.playerParty[i];
 }
 
@@ -85,7 +85,7 @@ static void SaveEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
         gSaveBlock1.eventObjects[i] = gEventObjects[i];
 }
 
@@ -93,7 +93,7 @@ static void LoadEventObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < EVENT_OBJECTS_COUNT; i++)
         gEventObjects[i] = gSaveBlock1.eventObjects[i];
 }
 
@@ -114,27 +114,27 @@ void LoadPlayerBag(void)
     int i;
 
     // load player items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gLoadedSaveData.items[i] = gSaveBlock1.bagPocket_Items[i];
 
     // load player key items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gLoadedSaveData.keyItems[i] = gSaveBlock1.bagPocket_KeyItems[i];
 
     // load player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gLoadedSaveData.pokeBalls[i] = gSaveBlock1.bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gLoadedSaveData.TMsHMs[i] = gSaveBlock1.bagPocket_TMHM[i];
 
     // load player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gLoadedSaveData.berries[i] = gSaveBlock1.bagPocket_Berries[i];
 
     // load mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gLoadedSaveData.mail[i] = gSaveBlock1.mail[i];
 }
 
@@ -143,26 +143,26 @@ void SavePlayerBag(void)
     int i;
 
     // save player items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gSaveBlock1.bagPocket_Items[i] = gLoadedSaveData.items[i];
 
     // save player key items.
-    for (i = 0; i < 20; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gSaveBlock1.bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
 
     // save player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gSaveBlock1.bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
 
     // save player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gSaveBlock1.bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
 
     // save player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gSaveBlock1.bagPocket_Berries[i] = gLoadedSaveData.berries[i];
 
     // save mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gSaveBlock1.mail[i] = gLoadedSaveData.mail[i];
 }
diff --git a/src/overworld.c b/src/overworld.c
index f6dea1271..a7a203ca2 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -24,7 +24,6 @@
 #include "load_save.h"
 #include "main.h"
 #include "m4a.h"
-#include "constants/maps.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "metatile_behavior.h"
@@ -38,9 +37,7 @@
 #include "script.h"
 #include "script_pokemon_80C4.h"
 #include "secret_base.h"
-#include "constants/songs.h"
 #include "sound.h"
-#include "constants/species.h"
 #include "start_menu.h"
 #include "task.h"
 #include "tileset_anim.h"
@@ -48,6 +45,10 @@
 #include "tv.h"
 #include "scanline_effect.h"
 #include "wild_encounter.h"
+#include "constants/map_types.h"
+#include "constants/maps.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 #ifdef SAPPHIRE
 #define LEGENDARY_MUSIC MUS_OOAME  // Heavy Rain
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 4f5094024..1883c8754 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -24,9 +24,1253 @@ struct Pokemon gPlayerParty[6];
 u8 gEnemyPartyCount;
 struct Pokemon gEnemyParty[6];
 
-const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151};
-const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358};
-const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411};
+const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex)
+{
+	         	                // SPECIES_NONE
+	HOENN_DEX_BULBASAUR,       	// SPECIES_BULBASAUR
+	HOENN_DEX_IVYSAUR,         	// SPECIES_IVYSAUR
+	HOENN_DEX_VENUSAUR,        	// SPECIES_VENUSAUR
+	HOENN_DEX_CHARMANDER,      	// SPECIES_CHARMANDER
+	HOENN_DEX_CHARMELEON,      	// SPECIES_CHARMELEON
+	HOENN_DEX_CHARIZARD,       	// SPECIES_CHARIZARD
+	HOENN_DEX_SQUIRTLE,        	// SPECIES_SQUIRTLE
+	HOENN_DEX_WARTORTLE,       	// SPECIES_WARTORTLE
+	HOENN_DEX_BLASTOISE,       	// SPECIES_BLASTOISE
+	HOENN_DEX_CATERPIE,        	// SPECIES_CATERPIE
+	HOENN_DEX_METAPOD,         	// SPECIES_METAPOD
+	HOENN_DEX_BUTTERFREE,      	// SPECIES_BUTTERFREE
+	HOENN_DEX_WEEDLE,          	// SPECIES_WEEDLE
+	HOENN_DEX_KAKUNA,          	// SPECIES_KAKUNA
+	HOENN_DEX_BEEDRILL,        	// SPECIES_BEEDRILL
+	HOENN_DEX_PIDGEY,          	// SPECIES_PIDGEY
+	HOENN_DEX_PIDGEOTTO,       	// SPECIES_PIDGEOTTO
+	HOENN_DEX_PIDGEOT,         	// SPECIES_PIDGEOT
+	HOENN_DEX_RATTATA,         	// SPECIES_RATTATA
+	HOENN_DEX_RATICATE,        	// SPECIES_RATICATE
+	HOENN_DEX_SPEAROW,         	// SPECIES_SPEAROW
+	HOENN_DEX_FEAROW,          	// SPECIES_FEAROW
+	HOENN_DEX_EKANS,           	// SPECIES_EKANS
+	HOENN_DEX_ARBOK,           	// SPECIES_ARBOK
+	HOENN_DEX_PIKACHU,         	// SPECIES_PIKACHU
+	HOENN_DEX_RAICHU,          	// SPECIES_RAICHU
+	HOENN_DEX_SANDSHREW,       	// SPECIES_SANDSHREW
+	HOENN_DEX_SANDSLASH,       	// SPECIES_SANDSLASH
+	HOENN_DEX_NIDORAN_F,       	// SPECIES_NIDORAN_F
+	HOENN_DEX_NIDORINA,        	// SPECIES_NIDORINA
+	HOENN_DEX_NIDOQUEEN,       	// SPECIES_NIDOQUEEN
+	HOENN_DEX_NIDORAN_M,       	// SPECIES_NIDORAN_M
+	HOENN_DEX_NIDORINO,        	// SPECIES_NIDORINO
+	HOENN_DEX_NIDOKING,        	// SPECIES_NIDOKING
+	HOENN_DEX_CLEFAIRY,        	// SPECIES_CLEFAIRY
+	HOENN_DEX_CLEFABLE,        	// SPECIES_CLEFABLE
+	HOENN_DEX_VULPIX,          	// SPECIES_VULPIX
+	HOENN_DEX_NINETALES,       	// SPECIES_NINETALES
+	HOENN_DEX_JIGGLYPUFF,      	// SPECIES_JIGGLYPUFF
+	HOENN_DEX_WIGGLYTUFF,      	// SPECIES_WIGGLYTUFF
+	HOENN_DEX_ZUBAT,           	// SPECIES_ZUBAT
+	HOENN_DEX_GOLBAT,          	// SPECIES_GOLBAT
+	HOENN_DEX_ODDISH,          	// SPECIES_ODDISH
+	HOENN_DEX_GLOOM,           	// SPECIES_GLOOM
+	HOENN_DEX_VILEPLUME,       	// SPECIES_VILEPLUME
+	HOENN_DEX_PARAS,           	// SPECIES_PARAS
+	HOENN_DEX_PARASECT,        	// SPECIES_PARASECT
+	HOENN_DEX_VENONAT,         	// SPECIES_VENONAT
+	HOENN_DEX_VENOMOTH,        	// SPECIES_VENOMOTH
+	HOENN_DEX_DIGLETT,         	// SPECIES_DIGLETT
+	HOENN_DEX_DUGTRIO,         	// SPECIES_DUGTRIO
+	HOENN_DEX_MEOWTH,          	// SPECIES_MEOWTH
+	HOENN_DEX_PERSIAN,         	// SPECIES_PERSIAN
+	HOENN_DEX_PSYDUCK,         	// SPECIES_PSYDUCK
+	HOENN_DEX_GOLDUCK,         	// SPECIES_GOLDUCK
+	HOENN_DEX_MANKEY,          	// SPECIES_MANKEY
+	HOENN_DEX_PRIMEAPE,        	// SPECIES_PRIMEAPE
+	HOENN_DEX_GROWLITHE,       	// SPECIES_GROWLITHE
+	HOENN_DEX_ARCANINE,        	// SPECIES_ARCANINE
+	HOENN_DEX_POLIWAG,         	// SPECIES_POLIWAG
+	HOENN_DEX_POLIWHIRL,       	// SPECIES_POLIWHIRL
+	HOENN_DEX_POLIWRATH,       	// SPECIES_POLIWRATH
+	HOENN_DEX_ABRA,            	// SPECIES_ABRA
+	HOENN_DEX_KADABRA,         	// SPECIES_KADABRA
+	HOENN_DEX_ALAKAZAM,        	// SPECIES_ALAKAZAM
+	HOENN_DEX_MACHOP,          	// SPECIES_MACHOP
+	HOENN_DEX_MACHOKE,         	// SPECIES_MACHOKE
+	HOENN_DEX_MACHAMP,         	// SPECIES_MACHAMP
+	HOENN_DEX_BELLSPROUT,      	// SPECIES_BELLSPROUT
+	HOENN_DEX_WEEPINBELL,      	// SPECIES_WEEPINBELL
+	HOENN_DEX_VICTREEBEL,      	// SPECIES_VICTREEBEL
+	HOENN_DEX_TENTACOOL,       	// SPECIES_TENTACOOL
+	HOENN_DEX_TENTACRUEL,      	// SPECIES_TENTACRUEL
+	HOENN_DEX_GEODUDE,         	// SPECIES_GEODUDE
+	HOENN_DEX_GRAVELER,        	// SPECIES_GRAVELER
+	HOENN_DEX_GOLEM,           	// SPECIES_GOLEM
+	HOENN_DEX_PONYTA,          	// SPECIES_PONYTA
+	HOENN_DEX_RAPIDASH,        	// SPECIES_RAPIDASH
+	HOENN_DEX_SLOWPOKE,        	// SPECIES_SLOWPOKE
+	HOENN_DEX_SLOWBRO,         	// SPECIES_SLOWBRO
+	HOENN_DEX_MAGNEMITE,       	// SPECIES_MAGNEMITE
+	HOENN_DEX_MAGNETON,        	// SPECIES_MAGNETON
+	HOENN_DEX_FARFETCHD,       	// SPECIES_FARFETCHD
+	HOENN_DEX_DODUO,           	// SPECIES_DODUO
+	HOENN_DEX_DODRIO,          	// SPECIES_DODRIO
+	HOENN_DEX_SEEL,            	// SPECIES_SEEL
+	HOENN_DEX_DEWGONG,         	// SPECIES_DEWGONG
+	HOENN_DEX_GRIMER,          	// SPECIES_GRIMER
+	HOENN_DEX_MUK,             	// SPECIES_MUK
+	HOENN_DEX_SHELLDER,        	// SPECIES_SHELLDER
+	HOENN_DEX_CLOYSTER,        	// SPECIES_CLOYSTER
+	HOENN_DEX_GASTLY,          	// SPECIES_GASTLY
+	HOENN_DEX_HAUNTER,         	// SPECIES_HAUNTER
+	HOENN_DEX_GENGAR,          	// SPECIES_GENGAR
+	HOENN_DEX_ONIX,            	// SPECIES_ONIX
+	HOENN_DEX_DROWZEE,         	// SPECIES_DROWZEE
+	HOENN_DEX_HYPNO,           	// SPECIES_HYPNO
+	HOENN_DEX_KRABBY,          	// SPECIES_KRABBY
+	HOENN_DEX_KINGLER,         	// SPECIES_KINGLER
+	HOENN_DEX_VOLTORB,         	// SPECIES_VOLTORB
+	HOENN_DEX_ELECTRODE,       	// SPECIES_ELECTRODE
+	HOENN_DEX_EXEGGCUTE,       	// SPECIES_EXEGGCUTE
+	HOENN_DEX_EXEGGUTOR,       	// SPECIES_EXEGGUTOR
+	HOENN_DEX_CUBONE,          	// SPECIES_CUBONE
+	HOENN_DEX_MAROWAK,         	// SPECIES_MAROWAK
+	HOENN_DEX_HITMONLEE,       	// SPECIES_HITMONLEE
+	HOENN_DEX_HITMONCHAN,      	// SPECIES_HITMONCHAN
+	HOENN_DEX_LICKITUNG,       	// SPECIES_LICKITUNG
+	HOENN_DEX_KOFFING,         	// SPECIES_KOFFING
+	HOENN_DEX_WEEZING,         	// SPECIES_WEEZING
+	HOENN_DEX_RHYHORN,         	// SPECIES_RHYHORN
+	HOENN_DEX_RHYDON,          	// SPECIES_RHYDON
+	HOENN_DEX_CHANSEY,         	// SPECIES_CHANSEY
+	HOENN_DEX_TANGELA,         	// SPECIES_TANGELA
+	HOENN_DEX_KANGASKHAN,      	// SPECIES_KANGASKHAN
+	HOENN_DEX_HORSEA,          	// SPECIES_HORSEA
+	HOENN_DEX_SEADRA,          	// SPECIES_SEADRA
+	HOENN_DEX_GOLDEEN,         	// SPECIES_GOLDEEN
+	HOENN_DEX_SEAKING,         	// SPECIES_SEAKING
+	HOENN_DEX_STARYU,          	// SPECIES_STARYU
+	HOENN_DEX_STARMIE,         	// SPECIES_STARMIE
+	HOENN_DEX_MR_MIME,         	// SPECIES_MR_MIME
+	HOENN_DEX_SCYTHER,         	// SPECIES_SCYTHER
+	HOENN_DEX_JYNX,            	// SPECIES_JYNX
+	HOENN_DEX_ELECTABUZZ,      	// SPECIES_ELECTABUZZ
+	HOENN_DEX_MAGMAR,          	// SPECIES_MAGMAR
+	HOENN_DEX_PINSIR,          	// SPECIES_PINSIR
+	HOENN_DEX_TAUROS,          	// SPECIES_TAUROS
+	HOENN_DEX_MAGIKARP,        	// SPECIES_MAGIKARP
+	HOENN_DEX_GYARADOS,        	// SPECIES_GYARADOS
+	HOENN_DEX_LAPRAS,          	// SPECIES_LAPRAS
+	HOENN_DEX_DITTO,           	// SPECIES_DITTO
+	HOENN_DEX_EEVEE,           	// SPECIES_EEVEE
+	HOENN_DEX_VAPOREON,        	// SPECIES_VAPOREON
+	HOENN_DEX_JOLTEON,         	// SPECIES_JOLTEON
+	HOENN_DEX_FLAREON,         	// SPECIES_FLAREON
+	HOENN_DEX_PORYGON,         	// SPECIES_PORYGON
+	HOENN_DEX_OMANYTE,         	// SPECIES_OMANYTE
+	HOENN_DEX_OMASTAR,         	// SPECIES_OMASTAR
+	HOENN_DEX_KABUTO,          	// SPECIES_KABUTO
+	HOENN_DEX_KABUTOPS,        	// SPECIES_KABUTOPS
+	HOENN_DEX_AERODACTYL,      	// SPECIES_AERODACTYL
+	HOENN_DEX_SNORLAX,         	// SPECIES_SNORLAX
+	HOENN_DEX_ARTICUNO,        	// SPECIES_ARTICUNO
+	HOENN_DEX_ZAPDOS,          	// SPECIES_ZAPDOS
+	HOENN_DEX_MOLTRES,         	// SPECIES_MOLTRES
+	HOENN_DEX_DRATINI,         	// SPECIES_DRATINI
+	HOENN_DEX_DRAGONAIR,       	// SPECIES_DRAGONAIR
+	HOENN_DEX_DRAGONITE,       	// SPECIES_DRAGONITE
+	HOENN_DEX_MEWTWO,          	// SPECIES_MEWTWO
+	HOENN_DEX_MEW,             	// SPECIES_MEW
+	HOENN_DEX_CHIKORITA,       	// SPECIES_CHIKORITA
+	HOENN_DEX_BAYLEEF,         	// SPECIES_BAYLEEF
+	HOENN_DEX_MEGANIUM,        	// SPECIES_MEGANIUM
+	HOENN_DEX_CYNDAQUIL,       	// SPECIES_CYNDAQUIL
+	HOENN_DEX_QUILAVA,         	// SPECIES_QUILAVA
+	HOENN_DEX_TYPHLOSION,      	// SPECIES_TYPHLOSION
+	HOENN_DEX_TOTODILE,        	// SPECIES_TOTODILE
+	HOENN_DEX_CROCONAW,        	// SPECIES_CROCONAW
+	HOENN_DEX_FERALIGATR,      	// SPECIES_FERALIGATR
+	HOENN_DEX_SENTRET,         	// SPECIES_SENTRET
+	HOENN_DEX_FURRET,          	// SPECIES_FURRET
+	HOENN_DEX_HOOTHOOT,        	// SPECIES_HOOTHOOT
+	HOENN_DEX_NOCTOWL,         	// SPECIES_NOCTOWL
+	HOENN_DEX_LEDYBA,          	// SPECIES_LEDYBA
+	HOENN_DEX_LEDIAN,          	// SPECIES_LEDIAN
+	HOENN_DEX_SPINARAK,        	// SPECIES_SPINARAK
+	HOENN_DEX_ARIADOS,         	// SPECIES_ARIADOS
+	HOENN_DEX_CROBAT,          	// SPECIES_CROBAT
+	HOENN_DEX_CHINCHOU,        	// SPECIES_CHINCHOU
+	HOENN_DEX_LANTURN,         	// SPECIES_LANTURN
+	HOENN_DEX_PICHU,           	// SPECIES_PICHU
+	HOENN_DEX_CLEFFA,          	// SPECIES_CLEFFA
+	HOENN_DEX_IGGLYBUFF,       	// SPECIES_IGGLYBUFF
+	HOENN_DEX_TOGEPI,          	// SPECIES_TOGEPI
+	HOENN_DEX_TOGETIC,         	// SPECIES_TOGETIC
+	HOENN_DEX_NATU,            	// SPECIES_NATU
+	HOENN_DEX_XATU,            	// SPECIES_XATU
+	HOENN_DEX_MAREEP,          	// SPECIES_MAREEP
+	HOENN_DEX_FLAAFFY,         	// SPECIES_FLAAFFY
+	HOENN_DEX_AMPHAROS,        	// SPECIES_AMPHAROS
+	HOENN_DEX_BELLOSSOM,       	// SPECIES_BELLOSSOM
+	HOENN_DEX_MARILL,          	// SPECIES_MARILL
+	HOENN_DEX_AZUMARILL,       	// SPECIES_AZUMARILL
+	HOENN_DEX_SUDOWOODO,       	// SPECIES_SUDOWOODO
+	HOENN_DEX_POLITOED,        	// SPECIES_POLITOED
+	HOENN_DEX_HOPPIP,          	// SPECIES_HOPPIP
+	HOENN_DEX_SKIPLOOM,        	// SPECIES_SKIPLOOM
+	HOENN_DEX_JUMPLUFF,        	// SPECIES_JUMPLUFF
+	HOENN_DEX_AIPOM,           	// SPECIES_AIPOM
+	HOENN_DEX_SUNKERN,         	// SPECIES_SUNKERN
+	HOENN_DEX_SUNFLORA,        	// SPECIES_SUNFLORA
+	HOENN_DEX_YANMA,           	// SPECIES_YANMA
+	HOENN_DEX_WOOPER,          	// SPECIES_WOOPER
+	HOENN_DEX_QUAGSIRE,        	// SPECIES_QUAGSIRE
+	HOENN_DEX_ESPEON,          	// SPECIES_ESPEON
+	HOENN_DEX_UMBREON,         	// SPECIES_UMBREON
+	HOENN_DEX_MURKROW,         	// SPECIES_MURKROW
+	HOENN_DEX_SLOWKING,        	// SPECIES_SLOWKING
+	HOENN_DEX_MISDREAVUS,      	// SPECIES_MISDREAVUS
+	HOENN_DEX_UNOWN,           	// SPECIES_UNOWN
+	HOENN_DEX_WOBBUFFET,       	// SPECIES_WOBBUFFET
+	HOENN_DEX_GIRAFARIG,       	// SPECIES_GIRAFARIG
+	HOENN_DEX_PINECO,          	// SPECIES_PINECO
+	HOENN_DEX_FORRETRESS,      	// SPECIES_FORRETRESS
+	HOENN_DEX_DUNSPARCE,       	// SPECIES_DUNSPARCE
+	HOENN_DEX_GLIGAR,          	// SPECIES_GLIGAR
+	HOENN_DEX_STEELIX,         	// SPECIES_STEELIX
+	HOENN_DEX_SNUBBULL,        	// SPECIES_SNUBBULL
+	HOENN_DEX_GRANBULL,        	// SPECIES_GRANBULL
+	HOENN_DEX_QWILFISH,        	// SPECIES_QWILFISH
+	HOENN_DEX_SCIZOR,          	// SPECIES_SCIZOR
+	HOENN_DEX_SHUCKLE,         	// SPECIES_SHUCKLE
+	HOENN_DEX_HERACROSS,       	// SPECIES_HERACROSS
+	HOENN_DEX_SNEASEL,         	// SPECIES_SNEASEL
+	HOENN_DEX_TEDDIURSA,       	// SPECIES_TEDDIURSA
+	HOENN_DEX_URSARING,        	// SPECIES_URSARING
+	HOENN_DEX_SLUGMA,          	// SPECIES_SLUGMA
+	HOENN_DEX_MAGCARGO,        	// SPECIES_MAGCARGO
+	HOENN_DEX_SWINUB,          	// SPECIES_SWINUB
+	HOENN_DEX_PILOSWINE,       	// SPECIES_PILOSWINE
+	HOENN_DEX_CORSOLA,         	// SPECIES_CORSOLA
+	HOENN_DEX_REMORAID,        	// SPECIES_REMORAID
+	HOENN_DEX_OCTILLERY,       	// SPECIES_OCTILLERY
+	HOENN_DEX_DELIBIRD,        	// SPECIES_DELIBIRD
+	HOENN_DEX_MANTINE,         	// SPECIES_MANTINE
+	HOENN_DEX_SKARMORY,        	// SPECIES_SKARMORY
+	HOENN_DEX_HOUNDOUR,        	// SPECIES_HOUNDOUR
+	HOENN_DEX_HOUNDOOM,        	// SPECIES_HOUNDOOM
+	HOENN_DEX_KINGDRA,         	// SPECIES_KINGDRA
+	HOENN_DEX_PHANPY,          	// SPECIES_PHANPY
+	HOENN_DEX_DONPHAN,         	// SPECIES_DONPHAN
+	HOENN_DEX_PORYGON2,        	// SPECIES_PORYGON2
+	HOENN_DEX_STANTLER,        	// SPECIES_STANTLER
+	HOENN_DEX_SMEARGLE,        	// SPECIES_SMEARGLE
+	HOENN_DEX_TYROGUE,         	// SPECIES_TYROGUE
+	HOENN_DEX_HITMONTOP,       	// SPECIES_HITMONTOP
+	HOENN_DEX_SMOOCHUM,        	// SPECIES_SMOOCHUM
+	HOENN_DEX_ELEKID,          	// SPECIES_ELEKID
+	HOENN_DEX_MAGBY,           	// SPECIES_MAGBY
+	HOENN_DEX_MILTANK,         	// SPECIES_MILTANK
+	HOENN_DEX_BLISSEY,         	// SPECIES_BLISSEY
+	HOENN_DEX_RAIKOU,          	// SPECIES_RAIKOU
+	HOENN_DEX_ENTEI,           	// SPECIES_ENTEI
+	HOENN_DEX_SUICUNE,         	// SPECIES_SUICUNE
+	HOENN_DEX_LARVITAR,        	// SPECIES_LARVITAR
+	HOENN_DEX_PUPITAR,         	// SPECIES_PUPITAR
+	HOENN_DEX_TYRANITAR,       	// SPECIES_TYRANITAR
+	HOENN_DEX_LUGIA,           	// SPECIES_LUGIA
+	HOENN_DEX_HO_OH,           	// SPECIES_HO-OH
+	HOENN_DEX_CELEBI,          	// SPECIES_CELEBI
+	HOENN_DEX_OLD_UNOWN_B,     	// SPECIES_OLD_UNOWN_B
+	HOENN_DEX_OLD_UNOWN_C,     	// SPECIES_OLD_UNOWN_C
+	HOENN_DEX_OLD_UNOWN_D,     	// SPECIES_OLD_UNOWN_D
+	HOENN_DEX_OLD_UNOWN_E,     	// SPECIES_OLD_UNOWN_E
+	HOENN_DEX_OLD_UNOWN_F,     	// SPECIES_OLD_UNOWN_F
+	HOENN_DEX_OLD_UNOWN_G,     	// SPECIES_OLD_UNOWN_G
+	HOENN_DEX_OLD_UNOWN_H,     	// SPECIES_OLD_UNOWN_H
+	HOENN_DEX_OLD_UNOWN_I,     	// SPECIES_OLD_UNOWN_I
+	HOENN_DEX_OLD_UNOWN_J,     	// SPECIES_OLD_UNOWN_J
+	HOENN_DEX_OLD_UNOWN_K,     	// SPECIES_OLD_UNOWN_K
+	HOENN_DEX_OLD_UNOWN_L,     	// SPECIES_OLD_UNOWN_L
+	HOENN_DEX_OLD_UNOWN_M,     	// SPECIES_OLD_UNOWN_M
+	HOENN_DEX_OLD_UNOWN_N,     	// SPECIES_OLD_UNOWN_N
+	HOENN_DEX_OLD_UNOWN_O,     	// SPECIES_OLD_UNOWN_O
+	HOENN_DEX_OLD_UNOWN_P,     	// SPECIES_OLD_UNOWN_P
+	HOENN_DEX_OLD_UNOWN_Q,     	// SPECIES_OLD_UNOWN_Q
+	HOENN_DEX_OLD_UNOWN_R,     	// SPECIES_OLD_UNOWN_R
+	HOENN_DEX_OLD_UNOWN_S,     	// SPECIES_OLD_UNOWN_S
+	HOENN_DEX_OLD_UNOWN_T,     	// SPECIES_OLD_UNOWN_T
+	HOENN_DEX_OLD_UNOWN_U,     	// SPECIES_OLD_UNOWN_U
+	HOENN_DEX_OLD_UNOWN_V,     	// SPECIES_OLD_UNOWN_V
+	HOENN_DEX_OLD_UNOWN_W,     	// SPECIES_OLD_UNOWN_W
+	HOENN_DEX_OLD_UNOWN_X,     	// SPECIES_OLD_UNOWN_X
+	HOENN_DEX_OLD_UNOWN_Y,     	// SPECIES_OLD_UNOWN_Y
+	HOENN_DEX_OLD_UNOWN_Z,     	// SPECIES_OLD_UNOWN_Z
+	HOENN_DEX_TREECKO,         	// SPECIES_TREECKO
+	HOENN_DEX_GROVYLE,         	// SPECIES_GROVYLE
+	HOENN_DEX_SCEPTILE,        	// SPECIES_SCEPTILE
+	HOENN_DEX_TORCHIC,         	// SPECIES_TORCHIC
+	HOENN_DEX_COMBUSKEN,       	// SPECIES_COMBUSKEN
+	HOENN_DEX_BLAZIKEN,        	// SPECIES_BLAZIKEN
+	HOENN_DEX_MUDKIP,          	// SPECIES_MUDKIP
+	HOENN_DEX_MARSHTOMP,       	// SPECIES_MARSHTOMP
+	HOENN_DEX_SWAMPERT,        	// SPECIES_SWAMPERT
+	HOENN_DEX_POOCHYENA,       	// SPECIES_POOCHYENA
+	HOENN_DEX_MIGHTYENA,       	// SPECIES_MIGHTYENA
+	HOENN_DEX_ZIGZAGOON,       	// SPECIES_ZIGZAGOON
+	HOENN_DEX_LINOONE,         	// SPECIES_LINOONE
+	HOENN_DEX_WURMPLE,         	// SPECIES_WURMPLE
+	HOENN_DEX_SILCOON,         	// SPECIES_SILCOON
+	HOENN_DEX_BEAUTIFLY,       	// SPECIES_BEAUTIFLY
+	HOENN_DEX_CASCOON,         	// SPECIES_CASCOON
+	HOENN_DEX_DUSTOX,          	// SPECIES_DUSTOX
+	HOENN_DEX_LOTAD,           	// SPECIES_LOTAD
+	HOENN_DEX_LOMBRE,          	// SPECIES_LOMBRE
+	HOENN_DEX_LUDICOLO,        	// SPECIES_LUDICOLO
+	HOENN_DEX_SEEDOT,          	// SPECIES_SEEDOT
+	HOENN_DEX_NUZLEAF,         	// SPECIES_NUZLEAF
+	HOENN_DEX_SHIFTRY,         	// SPECIES_SHIFTRY
+	HOENN_DEX_NINCADA,         	// SPECIES_NINCADA
+	HOENN_DEX_NINJASK,         	// SPECIES_NINJASK
+	HOENN_DEX_SHEDINJA,        	// SPECIES_SHEDINJA
+	HOENN_DEX_TAILLOW,         	// SPECIES_TAILLOW
+	HOENN_DEX_SWELLOW,         	// SPECIES_SWELLOW
+	HOENN_DEX_SHROOMISH,       	// SPECIES_SHROOMISH
+	HOENN_DEX_BRELOOM,         	// SPECIES_BRELOOM
+	HOENN_DEX_SPINDA,          	// SPECIES_SPINDA
+	HOENN_DEX_WINGULL,         	// SPECIES_WINGULL
+	HOENN_DEX_PELIPPER,        	// SPECIES_PELIPPER
+	HOENN_DEX_SURSKIT,         	// SPECIES_SURSKIT
+	HOENN_DEX_MASQUERAIN,      	// SPECIES_MASQUERAIN
+	HOENN_DEX_WAILMER,         	// SPECIES_WAILMER
+	HOENN_DEX_WAILORD,         	// SPECIES_WAILORD
+	HOENN_DEX_SKITTY,          	// SPECIES_SKITTY
+	HOENN_DEX_DELCATTY,        	// SPECIES_DELCATTY
+	HOENN_DEX_KECLEON,         	// SPECIES_KECLEON
+	HOENN_DEX_BALTOY,          	// SPECIES_BALTOY
+	HOENN_DEX_CLAYDOL,         	// SPECIES_CLAYDOL
+	HOENN_DEX_NOSEPASS,        	// SPECIES_NOSEPASS
+	HOENN_DEX_TORKOAL,         	// SPECIES_TORKOAL
+	HOENN_DEX_SABLEYE,         	// SPECIES_SABLEYE
+	HOENN_DEX_BARBOACH,        	// SPECIES_BARBOACH
+	HOENN_DEX_WHISCASH,        	// SPECIES_WHISCASH
+	HOENN_DEX_LUVDISC,         	// SPECIES_LUVDISC
+	HOENN_DEX_CORPHISH,        	// SPECIES_CORPHISH
+	HOENN_DEX_CRAWDAUNT,       	// SPECIES_CRAWDAUNT
+	HOENN_DEX_FEEBAS,          	// SPECIES_FEEBAS
+	HOENN_DEX_MILOTIC,         	// SPECIES_MILOTIC
+	HOENN_DEX_CARVANHA,        	// SPECIES_CARVANHA
+	HOENN_DEX_SHARPEDO,        	// SPECIES_SHARPEDO
+	HOENN_DEX_TRAPINCH,        	// SPECIES_TRAPINCH
+	HOENN_DEX_VIBRAVA,         	// SPECIES_VIBRAVA
+	HOENN_DEX_FLYGON,          	// SPECIES_FLYGON
+	HOENN_DEX_MAKUHITA,        	// SPECIES_MAKUHITA
+	HOENN_DEX_HARIYAMA,        	// SPECIES_HARIYAMA
+	HOENN_DEX_ELECTRIKE,       	// SPECIES_ELECTRIKE
+	HOENN_DEX_MANECTRIC,       	// SPECIES_MANECTRIC
+	HOENN_DEX_NUMEL,           	// SPECIES_NUMEL
+	HOENN_DEX_CAMERUPT,        	// SPECIES_CAMERUPT
+	HOENN_DEX_SPHEAL,          	// SPECIES_SPHEAL
+	HOENN_DEX_SEALEO,          	// SPECIES_SEALEO
+	HOENN_DEX_WALREIN,         	// SPECIES_WALREIN
+	HOENN_DEX_CACNEA,          	// SPECIES_CACNEA
+	HOENN_DEX_CACTURNE,        	// SPECIES_CACTURNE
+	HOENN_DEX_SNORUNT,         	// SPECIES_SNORUNT
+	HOENN_DEX_GLALIE,          	// SPECIES_GLALIE
+	HOENN_DEX_LUNATONE,        	// SPECIES_LUNATONE
+	HOENN_DEX_SOLROCK,         	// SPECIES_SOLROCK
+	HOENN_DEX_AZURILL,         	// SPECIES_AZURILL
+	HOENN_DEX_SPOINK,          	// SPECIES_SPOINK
+	HOENN_DEX_GRUMPIG,         	// SPECIES_GRUMPIG
+	HOENN_DEX_PLUSLE,          	// SPECIES_PLUSLE
+	HOENN_DEX_MINUN,           	// SPECIES_MINUN
+	HOENN_DEX_MAWILE,          	// SPECIES_MAWILE
+	HOENN_DEX_MEDITITE,        	// SPECIES_MEDITITE
+	HOENN_DEX_MEDICHAM,        	// SPECIES_MEDICHAM
+	HOENN_DEX_SWABLU,          	// SPECIES_SWABLU
+	HOENN_DEX_ALTARIA,         	// SPECIES_ALTARIA
+	HOENN_DEX_WYNAUT,          	// SPECIES_WYNAUT
+	HOENN_DEX_DUSKULL,         	// SPECIES_DUSKULL
+	HOENN_DEX_DUSCLOPS,        	// SPECIES_DUSCLOPS
+	HOENN_DEX_ROSELIA,         	// SPECIES_ROSELIA
+	HOENN_DEX_SLAKOTH,         	// SPECIES_SLAKOTH
+	HOENN_DEX_VIGOROTH,        	// SPECIES_VIGOROTH
+	HOENN_DEX_SLAKING,         	// SPECIES_SLAKING
+	HOENN_DEX_GULPIN,          	// SPECIES_GULPIN
+	HOENN_DEX_SWALOT,          	// SPECIES_SWALOT
+	HOENN_DEX_TROPIUS,         	// SPECIES_TROPIUS
+	HOENN_DEX_WHISMUR,         	// SPECIES_WHISMUR
+	HOENN_DEX_LOUDRED,         	// SPECIES_LOUDRED
+	HOENN_DEX_EXPLOUD,         	// SPECIES_EXPLOUD
+	HOENN_DEX_CLAMPERL,        	// SPECIES_CLAMPERL
+	HOENN_DEX_HUNTAIL,         	// SPECIES_HUNTAIL
+	HOENN_DEX_GOREBYSS,        	// SPECIES_GOREBYSS
+	HOENN_DEX_ABSOL,           	// SPECIES_ABSOL
+	HOENN_DEX_SHUPPET,         	// SPECIES_SHUPPET
+	HOENN_DEX_BANETTE,         	// SPECIES_BANETTE
+	HOENN_DEX_SEVIPER,         	// SPECIES_SEVIPER
+	HOENN_DEX_ZANGOOSE,        	// SPECIES_ZANGOOSE
+	HOENN_DEX_RELICANTH,       	// SPECIES_RELICANTH
+	HOENN_DEX_ARON,            	// SPECIES_ARON
+	HOENN_DEX_LAIRON,          	// SPECIES_LAIRON
+	HOENN_DEX_AGGRON,          	// SPECIES_AGGRON
+	HOENN_DEX_CASTFORM,        	// SPECIES_CASTFORM
+	HOENN_DEX_VOLBEAT,         	// SPECIES_VOLBEAT
+	HOENN_DEX_ILLUMISE,        	// SPECIES_ILLUMISE
+	HOENN_DEX_LILEEP,          	// SPECIES_LILEEP
+	HOENN_DEX_CRADILY,         	// SPECIES_CRADILY
+	HOENN_DEX_ANORITH,         	// SPECIES_ANORITH
+	HOENN_DEX_ARMALDO,         	// SPECIES_ARMALDO
+	HOENN_DEX_RALTS,           	// SPECIES_RALTS
+	HOENN_DEX_KIRLIA,          	// SPECIES_KIRLIA
+	HOENN_DEX_GARDEVOIR,       	// SPECIES_GARDEVOIR
+	HOENN_DEX_BAGON,           	// SPECIES_BAGON
+	HOENN_DEX_SHELGON,         	// SPECIES_SHELGON
+	HOENN_DEX_SALAMENCE,       	// SPECIES_SALAMENCE
+	HOENN_DEX_BELDUM,          	// SPECIES_BELDUM
+	HOENN_DEX_METANG,          	// SPECIES_METANG
+	HOENN_DEX_METAGROSS,       	// SPECIES_METAGROSS
+	HOENN_DEX_REGIROCK,        	// SPECIES_REGIROCK
+	HOENN_DEX_REGICE,          	// SPECIES_REGICE
+	HOENN_DEX_REGISTEEL,       	// SPECIES_REGISTEEL
+	HOENN_DEX_KYOGRE,          	// SPECIES_KYOGRE
+	HOENN_DEX_GROUDON,         	// SPECIES_GROUDON
+	HOENN_DEX_RAYQUAZA,        	// SPECIES_RAYQUAZA
+	HOENN_DEX_LATIAS,          	// SPECIES_LATIAS
+	HOENN_DEX_LATIOS,          	// SPECIES_LATIOS
+	HOENN_DEX_JIRACHI,         	// SPECIES_JIRACHI
+	HOENN_DEX_DEOXYS,          	// SPECIES_DEOXYS
+	HOENN_DEX_CHIMECHO         	// SPECIES_CHIMECHO
+};
+
+const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index (Summary No. for National Dex)
+{
+	         	                // SPECIES_NONE
+	NATIONAL_DEX_BULBASAUR,       	// SPECIES_BULBASAUR
+	NATIONAL_DEX_IVYSAUR,         	// SPECIES_IVYSAUR
+	NATIONAL_DEX_VENUSAUR,        	// SPECIES_VENUSAUR
+	NATIONAL_DEX_CHARMANDER,      	// SPECIES_CHARMANDER
+	NATIONAL_DEX_CHARMELEON,      	// SPECIES_CHARMELEON
+	NATIONAL_DEX_CHARIZARD,       	// SPECIES_CHARIZARD
+	NATIONAL_DEX_SQUIRTLE,        	// SPECIES_SQUIRTLE
+	NATIONAL_DEX_WARTORTLE,       	// SPECIES_WARTORTLE
+	NATIONAL_DEX_BLASTOISE,       	// SPECIES_BLASTOISE
+	NATIONAL_DEX_CATERPIE,        	// SPECIES_CATERPIE
+	NATIONAL_DEX_METAPOD,         	// SPECIES_METAPOD
+	NATIONAL_DEX_BUTTERFREE,      	// SPECIES_BUTTERFREE
+	NATIONAL_DEX_WEEDLE,          	// SPECIES_WEEDLE
+	NATIONAL_DEX_KAKUNA,          	// SPECIES_KAKUNA
+	NATIONAL_DEX_BEEDRILL,        	// SPECIES_BEEDRILL
+	NATIONAL_DEX_PIDGEY,          	// SPECIES_PIDGEY
+	NATIONAL_DEX_PIDGEOTTO,       	// SPECIES_PIDGEOTTO
+	NATIONAL_DEX_PIDGEOT,         	// SPECIES_PIDGEOT
+	NATIONAL_DEX_RATTATA,         	// SPECIES_RATTATA
+	NATIONAL_DEX_RATICATE,        	// SPECIES_RATICATE
+	NATIONAL_DEX_SPEAROW,         	// SPECIES_SPEAROW
+	NATIONAL_DEX_FEAROW,          	// SPECIES_FEAROW
+	NATIONAL_DEX_EKANS,           	// SPECIES_EKANS
+	NATIONAL_DEX_ARBOK,           	// SPECIES_ARBOK
+	NATIONAL_DEX_PIKACHU,         	// SPECIES_PIKACHU
+	NATIONAL_DEX_RAICHU,          	// SPECIES_RAICHU
+	NATIONAL_DEX_SANDSHREW,       	// SPECIES_SANDSHREW
+	NATIONAL_DEX_SANDSLASH,       	// SPECIES_SANDSLASH
+	NATIONAL_DEX_NIDORAN_F,       	// SPECIES_NIDORAN_F
+	NATIONAL_DEX_NIDORINA,        	// SPECIES_NIDORINA
+	NATIONAL_DEX_NIDOQUEEN,       	// SPECIES_NIDOQUEEN
+	NATIONAL_DEX_NIDORAN_M,       	// SPECIES_NIDORAN_M
+	NATIONAL_DEX_NIDORINO,        	// SPECIES_NIDORINO
+	NATIONAL_DEX_NIDOKING,        	// SPECIES_NIDOKING
+	NATIONAL_DEX_CLEFAIRY,        	// SPECIES_CLEFAIRY
+	NATIONAL_DEX_CLEFABLE,        	// SPECIES_CLEFABLE
+	NATIONAL_DEX_VULPIX,          	// SPECIES_VULPIX
+	NATIONAL_DEX_NINETALES,       	// SPECIES_NINETALES
+	NATIONAL_DEX_JIGGLYPUFF,      	// SPECIES_JIGGLYPUFF
+	NATIONAL_DEX_WIGGLYTUFF,      	// SPECIES_WIGGLYTUFF
+	NATIONAL_DEX_ZUBAT,           	// SPECIES_ZUBAT
+	NATIONAL_DEX_GOLBAT,          	// SPECIES_GOLBAT
+	NATIONAL_DEX_ODDISH,          	// SPECIES_ODDISH
+	NATIONAL_DEX_GLOOM,           	// SPECIES_GLOOM
+	NATIONAL_DEX_VILEPLUME,       	// SPECIES_VILEPLUME
+	NATIONAL_DEX_PARAS,           	// SPECIES_PARAS
+	NATIONAL_DEX_PARASECT,        	// SPECIES_PARASECT
+	NATIONAL_DEX_VENONAT,         	// SPECIES_VENONAT
+	NATIONAL_DEX_VENOMOTH,        	// SPECIES_VENOMOTH
+	NATIONAL_DEX_DIGLETT,         	// SPECIES_DIGLETT
+	NATIONAL_DEX_DUGTRIO,         	// SPECIES_DUGTRIO
+	NATIONAL_DEX_MEOWTH,          	// SPECIES_MEOWTH
+	NATIONAL_DEX_PERSIAN,         	// SPECIES_PERSIAN
+	NATIONAL_DEX_PSYDUCK,         	// SPECIES_PSYDUCK
+	NATIONAL_DEX_GOLDUCK,         	// SPECIES_GOLDUCK
+	NATIONAL_DEX_MANKEY,          	// SPECIES_MANKEY
+	NATIONAL_DEX_PRIMEAPE,        	// SPECIES_PRIMEAPE
+	NATIONAL_DEX_GROWLITHE,       	// SPECIES_GROWLITHE
+	NATIONAL_DEX_ARCANINE,        	// SPECIES_ARCANINE
+	NATIONAL_DEX_POLIWAG,         	// SPECIES_POLIWAG
+	NATIONAL_DEX_POLIWHIRL,       	// SPECIES_POLIWHIRL
+	NATIONAL_DEX_POLIWRATH,       	// SPECIES_POLIWRATH
+	NATIONAL_DEX_ABRA,            	// SPECIES_ABRA
+	NATIONAL_DEX_KADABRA,         	// SPECIES_KADABRA
+	NATIONAL_DEX_ALAKAZAM,        	// SPECIES_ALAKAZAM
+	NATIONAL_DEX_MACHOP,          	// SPECIES_MACHOP
+	NATIONAL_DEX_MACHOKE,         	// SPECIES_MACHOKE
+	NATIONAL_DEX_MACHAMP,         	// SPECIES_MACHAMP
+	NATIONAL_DEX_BELLSPROUT,      	// SPECIES_BELLSPROUT
+	NATIONAL_DEX_WEEPINBELL,      	// SPECIES_WEEPINBELL
+	NATIONAL_DEX_VICTREEBEL,      	// SPECIES_VICTREEBEL
+	NATIONAL_DEX_TENTACOOL,       	// SPECIES_TENTACOOL
+	NATIONAL_DEX_TENTACRUEL,      	// SPECIES_TENTACRUEL
+	NATIONAL_DEX_GEODUDE,         	// SPECIES_GEODUDE
+	NATIONAL_DEX_GRAVELER,        	// SPECIES_GRAVELER
+	NATIONAL_DEX_GOLEM,           	// SPECIES_GOLEM
+	NATIONAL_DEX_PONYTA,          	// SPECIES_PONYTA
+	NATIONAL_DEX_RAPIDASH,        	// SPECIES_RAPIDASH
+	NATIONAL_DEX_SLOWPOKE,        	// SPECIES_SLOWPOKE
+	NATIONAL_DEX_SLOWBRO,         	// SPECIES_SLOWBRO
+	NATIONAL_DEX_MAGNEMITE,       	// SPECIES_MAGNEMITE
+	NATIONAL_DEX_MAGNETON,        	// SPECIES_MAGNETON
+	NATIONAL_DEX_FARFETCHD,       	// SPECIES_FARFETCHD
+	NATIONAL_DEX_DODUO,           	// SPECIES_DODUO
+	NATIONAL_DEX_DODRIO,          	// SPECIES_DODRIO
+	NATIONAL_DEX_SEEL,            	// SPECIES_SEEL
+	NATIONAL_DEX_DEWGONG,         	// SPECIES_DEWGONG
+	NATIONAL_DEX_GRIMER,          	// SPECIES_GRIMER
+	NATIONAL_DEX_MUK,             	// SPECIES_MUK
+	NATIONAL_DEX_SHELLDER,        	// SPECIES_SHELLDER
+	NATIONAL_DEX_CLOYSTER,        	// SPECIES_CLOYSTER
+	NATIONAL_DEX_GASTLY,          	// SPECIES_GASTLY
+	NATIONAL_DEX_HAUNTER,         	// SPECIES_HAUNTER
+	NATIONAL_DEX_GENGAR,          	// SPECIES_GENGAR
+	NATIONAL_DEX_ONIX,            	// SPECIES_ONIX
+	NATIONAL_DEX_DROWZEE,         	// SPECIES_DROWZEE
+	NATIONAL_DEX_HYPNO,           	// SPECIES_HYPNO
+	NATIONAL_DEX_KRABBY,          	// SPECIES_KRABBY
+	NATIONAL_DEX_KINGLER,         	// SPECIES_KINGLER
+	NATIONAL_DEX_VOLTORB,         	// SPECIES_VOLTORB
+	NATIONAL_DEX_ELECTRODE,       	// SPECIES_ELECTRODE
+	NATIONAL_DEX_EXEGGCUTE,       	// SPECIES_EXEGGCUTE
+	NATIONAL_DEX_EXEGGUTOR,       	// SPECIES_EXEGGUTOR
+	NATIONAL_DEX_CUBONE,          	// SPECIES_CUBONE
+	NATIONAL_DEX_MAROWAK,         	// SPECIES_MAROWAK
+	NATIONAL_DEX_HITMONLEE,       	// SPECIES_HITMONLEE
+	NATIONAL_DEX_HITMONCHAN,      	// SPECIES_HITMONCHAN
+	NATIONAL_DEX_LICKITUNG,       	// SPECIES_LICKITUNG
+	NATIONAL_DEX_KOFFING,         	// SPECIES_KOFFING
+	NATIONAL_DEX_WEEZING,         	// SPECIES_WEEZING
+	NATIONAL_DEX_RHYHORN,         	// SPECIES_RHYHORN
+	NATIONAL_DEX_RHYDON,          	// SPECIES_RHYDON
+	NATIONAL_DEX_CHANSEY,         	// SPECIES_CHANSEY
+	NATIONAL_DEX_TANGELA,         	// SPECIES_TANGELA
+	NATIONAL_DEX_KANGASKHAN,      	// SPECIES_KANGASKHAN
+	NATIONAL_DEX_HORSEA,          	// SPECIES_HORSEA
+	NATIONAL_DEX_SEADRA,          	// SPECIES_SEADRA
+	NATIONAL_DEX_GOLDEEN,         	// SPECIES_GOLDEEN
+	NATIONAL_DEX_SEAKING,         	// SPECIES_SEAKING
+	NATIONAL_DEX_STARYU,          	// SPECIES_STARYU
+	NATIONAL_DEX_STARMIE,         	// SPECIES_STARMIE
+	NATIONAL_DEX_MR_MIME,         	// SPECIES_MR_MIME
+	NATIONAL_DEX_SCYTHER,         	// SPECIES_SCYTHER
+	NATIONAL_DEX_JYNX,            	// SPECIES_JYNX
+	NATIONAL_DEX_ELECTABUZZ,      	// SPECIES_ELECTABUZZ
+	NATIONAL_DEX_MAGMAR,          	// SPECIES_MAGMAR
+	NATIONAL_DEX_PINSIR,          	// SPECIES_PINSIR
+	NATIONAL_DEX_TAUROS,          	// SPECIES_TAUROS
+	NATIONAL_DEX_MAGIKARP,        	// SPECIES_MAGIKARP
+	NATIONAL_DEX_GYARADOS,        	// SPECIES_GYARADOS
+	NATIONAL_DEX_LAPRAS,          	// SPECIES_LAPRAS
+	NATIONAL_DEX_DITTO,           	// SPECIES_DITTO
+	NATIONAL_DEX_EEVEE,           	// SPECIES_EEVEE
+	NATIONAL_DEX_VAPOREON,        	// SPECIES_VAPOREON
+	NATIONAL_DEX_JOLTEON,         	// SPECIES_JOLTEON
+	NATIONAL_DEX_FLAREON,         	// SPECIES_FLAREON
+	NATIONAL_DEX_PORYGON,         	// SPECIES_PORYGON
+	NATIONAL_DEX_OMANYTE,         	// SPECIES_OMANYTE
+	NATIONAL_DEX_OMASTAR,         	// SPECIES_OMASTAR
+	NATIONAL_DEX_KABUTO,          	// SPECIES_KABUTO
+	NATIONAL_DEX_KABUTOPS,        	// SPECIES_KABUTOPS
+	NATIONAL_DEX_AERODACTYL,      	// SPECIES_AERODACTYL
+	NATIONAL_DEX_SNORLAX,         	// SPECIES_SNORLAX
+	NATIONAL_DEX_ARTICUNO,        	// SPECIES_ARTICUNO
+	NATIONAL_DEX_ZAPDOS,          	// SPECIES_ZAPDOS
+	NATIONAL_DEX_MOLTRES,         	// SPECIES_MOLTRES
+	NATIONAL_DEX_DRATINI,         	// SPECIES_DRATINI
+	NATIONAL_DEX_DRAGONAIR,       	// SPECIES_DRAGONAIR
+	NATIONAL_DEX_DRAGONITE,       	// SPECIES_DRAGONITE
+	NATIONAL_DEX_MEWTWO,          	// SPECIES_MEWTWO
+	NATIONAL_DEX_MEW,             	// SPECIES_MEW
+	NATIONAL_DEX_CHIKORITA,       	// SPECIES_CHIKORITA
+	NATIONAL_DEX_BAYLEEF,         	// SPECIES_BAYLEEF
+	NATIONAL_DEX_MEGANIUM,        	// SPECIES_MEGANIUM
+	NATIONAL_DEX_CYNDAQUIL,       	// SPECIES_CYNDAQUIL
+	NATIONAL_DEX_QUILAVA,         	// SPECIES_QUILAVA
+	NATIONAL_DEX_TYPHLOSION,      	// SPECIES_TYPHLOSION
+	NATIONAL_DEX_TOTODILE,        	// SPECIES_TOTODILE
+	NATIONAL_DEX_CROCONAW,        	// SPECIES_CROCONAW
+	NATIONAL_DEX_FERALIGATR,      	// SPECIES_FERALIGATR
+	NATIONAL_DEX_SENTRET,         	// SPECIES_SENTRET
+	NATIONAL_DEX_FURRET,          	// SPECIES_FURRET
+	NATIONAL_DEX_HOOTHOOT,        	// SPECIES_HOOTHOOT
+	NATIONAL_DEX_NOCTOWL,         	// SPECIES_NOCTOWL
+	NATIONAL_DEX_LEDYBA,          	// SPECIES_LEDYBA
+	NATIONAL_DEX_LEDIAN,          	// SPECIES_LEDIAN
+	NATIONAL_DEX_SPINARAK,        	// SPECIES_SPINARAK
+	NATIONAL_DEX_ARIADOS,         	// SPECIES_ARIADOS
+	NATIONAL_DEX_CROBAT,          	// SPECIES_CROBAT
+	NATIONAL_DEX_CHINCHOU,        	// SPECIES_CHINCHOU
+	NATIONAL_DEX_LANTURN,         	// SPECIES_LANTURN
+	NATIONAL_DEX_PICHU,           	// SPECIES_PICHU
+	NATIONAL_DEX_CLEFFA,          	// SPECIES_CLEFFA
+	NATIONAL_DEX_IGGLYBUFF,       	// SPECIES_IGGLYBUFF
+	NATIONAL_DEX_TOGEPI,          	// SPECIES_TOGEPI
+	NATIONAL_DEX_TOGETIC,         	// SPECIES_TOGETIC
+	NATIONAL_DEX_NATU,            	// SPECIES_NATU
+	NATIONAL_DEX_XATU,            	// SPECIES_XATU
+	NATIONAL_DEX_MAREEP,          	// SPECIES_MAREEP
+	NATIONAL_DEX_FLAAFFY,         	// SPECIES_FLAAFFY
+	NATIONAL_DEX_AMPHAROS,        	// SPECIES_AMPHAROS
+	NATIONAL_DEX_BELLOSSOM,       	// SPECIES_BELLOSSOM
+	NATIONAL_DEX_MARILL,          	// SPECIES_MARILL
+	NATIONAL_DEX_AZUMARILL,       	// SPECIES_AZUMARILL
+	NATIONAL_DEX_SUDOWOODO,       	// SPECIES_SUDOWOODO
+	NATIONAL_DEX_POLITOED,        	// SPECIES_POLITOED
+	NATIONAL_DEX_HOPPIP,          	// SPECIES_HOPPIP
+	NATIONAL_DEX_SKIPLOOM,        	// SPECIES_SKIPLOOM
+	NATIONAL_DEX_JUMPLUFF,        	// SPECIES_JUMPLUFF
+	NATIONAL_DEX_AIPOM,           	// SPECIES_AIPOM
+	NATIONAL_DEX_SUNKERN,         	// SPECIES_SUNKERN
+	NATIONAL_DEX_SUNFLORA,        	// SPECIES_SUNFLORA
+	NATIONAL_DEX_YANMA,           	// SPECIES_YANMA
+	NATIONAL_DEX_WOOPER,          	// SPECIES_WOOPER
+	NATIONAL_DEX_QUAGSIRE,        	// SPECIES_QUAGSIRE
+	NATIONAL_DEX_ESPEON,          	// SPECIES_ESPEON
+	NATIONAL_DEX_UMBREON,         	// SPECIES_UMBREON
+	NATIONAL_DEX_MURKROW,         	// SPECIES_MURKROW
+	NATIONAL_DEX_SLOWKING,        	// SPECIES_SLOWKING
+	NATIONAL_DEX_MISDREAVUS,      	// SPECIES_MISDREAVUS
+	NATIONAL_DEX_UNOWN,           	// SPECIES_UNOWN
+	NATIONAL_DEX_WOBBUFFET,       	// SPECIES_WOBBUFFET
+	NATIONAL_DEX_GIRAFARIG,       	// SPECIES_GIRAFARIG
+	NATIONAL_DEX_PINECO,          	// SPECIES_PINECO
+	NATIONAL_DEX_FORRETRESS,      	// SPECIES_FORRETRESS
+	NATIONAL_DEX_DUNSPARCE,       	// SPECIES_DUNSPARCE
+	NATIONAL_DEX_GLIGAR,          	// SPECIES_GLIGAR
+	NATIONAL_DEX_STEELIX,         	// SPECIES_STEELIX
+	NATIONAL_DEX_SNUBBULL,        	// SPECIES_SNUBBULL
+	NATIONAL_DEX_GRANBULL,        	// SPECIES_GRANBULL
+	NATIONAL_DEX_QWILFISH,        	// SPECIES_QWILFISH
+	NATIONAL_DEX_SCIZOR,          	// SPECIES_SCIZOR
+	NATIONAL_DEX_SHUCKLE,         	// SPECIES_SHUCKLE
+	NATIONAL_DEX_HERACROSS,       	// SPECIES_HERACROSS
+	NATIONAL_DEX_SNEASEL,         	// SPECIES_SNEASEL
+	NATIONAL_DEX_TEDDIURSA,       	// SPECIES_TEDDIURSA
+	NATIONAL_DEX_URSARING,        	// SPECIES_URSARING
+	NATIONAL_DEX_SLUGMA,          	// SPECIES_SLUGMA
+	NATIONAL_DEX_MAGCARGO,        	// SPECIES_MAGCARGO
+	NATIONAL_DEX_SWINUB,          	// SPECIES_SWINUB
+	NATIONAL_DEX_PILOSWINE,       	// SPECIES_PILOSWINE
+	NATIONAL_DEX_CORSOLA,         	// SPECIES_CORSOLA
+	NATIONAL_DEX_REMORAID,        	// SPECIES_REMORAID
+	NATIONAL_DEX_OCTILLERY,       	// SPECIES_OCTILLERY
+	NATIONAL_DEX_DELIBIRD,        	// SPECIES_DELIBIRD
+	NATIONAL_DEX_MANTINE,         	// SPECIES_MANTINE
+	NATIONAL_DEX_SKARMORY,        	// SPECIES_SKARMORY
+	NATIONAL_DEX_HOUNDOUR,        	// SPECIES_HOUNDOUR
+	NATIONAL_DEX_HOUNDOOM,        	// SPECIES_HOUNDOOM
+	NATIONAL_DEX_KINGDRA,         	// SPECIES_KINGDRA
+	NATIONAL_DEX_PHANPY,          	// SPECIES_PHANPY
+	NATIONAL_DEX_DONPHAN,         	// SPECIES_DONPHAN
+	NATIONAL_DEX_PORYGON2,        	// SPECIES_PORYGON2
+	NATIONAL_DEX_STANTLER,        	// SPECIES_STANTLER
+	NATIONAL_DEX_SMEARGLE,        	// SPECIES_SMEARGLE
+	NATIONAL_DEX_TYROGUE,         	// SPECIES_TYROGUE
+	NATIONAL_DEX_HITMONTOP,       	// SPECIES_HITMONTOP
+	NATIONAL_DEX_SMOOCHUM,        	// SPECIES_SMOOCHUM
+	NATIONAL_DEX_ELEKID,          	// SPECIES_ELEKID
+	NATIONAL_DEX_MAGBY,           	// SPECIES_MAGBY
+	NATIONAL_DEX_MILTANK,         	// SPECIES_MILTANK
+	NATIONAL_DEX_BLISSEY,         	// SPECIES_BLISSEY
+	NATIONAL_DEX_RAIKOU,          	// SPECIES_RAIKOU
+	NATIONAL_DEX_ENTEI,           	// SPECIES_ENTEI
+	NATIONAL_DEX_SUICUNE,         	// SPECIES_SUICUNE
+	NATIONAL_DEX_LARVITAR,        	// SPECIES_LARVITAR
+	NATIONAL_DEX_PUPITAR,         	// SPECIES_PUPITAR
+	NATIONAL_DEX_TYRANITAR,       	// SPECIES_TYRANITAR
+	NATIONAL_DEX_LUGIA,           	// SPECIES_LUGIA
+	NATIONAL_DEX_HO_OH,           	// SPECIES_HO-OH
+	NATIONAL_DEX_CELEBI,          	// SPECIES_CELEBI
+	NATIONAL_DEX_OLD_UNOWN_B,  	// SPECIES_OLD_UNOWN_B
+	NATIONAL_DEX_OLD_UNOWN_C,  	// SPECIES_OLD_UNOWN_C
+	NATIONAL_DEX_OLD_UNOWN_D,  	// SPECIES_OLD_UNOWN_D
+	NATIONAL_DEX_OLD_UNOWN_E,  	// SPECIES_OLD_UNOWN_E
+	NATIONAL_DEX_OLD_UNOWN_F,  	// SPECIES_OLD_UNOWN_F
+	NATIONAL_DEX_OLD_UNOWN_G,  	// SPECIES_OLD_UNOWN_G
+	NATIONAL_DEX_OLD_UNOWN_H,  	// SPECIES_OLD_UNOWN_H
+	NATIONAL_DEX_OLD_UNOWN_I,  	// SPECIES_OLD_UNOWN_I
+	NATIONAL_DEX_OLD_UNOWN_J,  	// SPECIES_OLD_UNOWN_J
+	NATIONAL_DEX_OLD_UNOWN_K,  	// SPECIES_OLD_UNOWN_K
+	NATIONAL_DEX_OLD_UNOWN_L,  	// SPECIES_OLD_UNOWN_L
+	NATIONAL_DEX_OLD_UNOWN_M,  	// SPECIES_OLD_UNOWN_M
+	NATIONAL_DEX_OLD_UNOWN_N,  	// SPECIES_OLD_UNOWN_N
+	NATIONAL_DEX_OLD_UNOWN_O,  	// SPECIES_OLD_UNOWN_O
+	NATIONAL_DEX_OLD_UNOWN_P,  	// SPECIES_OLD_UNOWN_P
+	NATIONAL_DEX_OLD_UNOWN_Q,  	// SPECIES_OLD_UNOWN_Q
+	NATIONAL_DEX_OLD_UNOWN_R,  	// SPECIES_OLD_UNOWN_R
+	NATIONAL_DEX_OLD_UNOWN_S,  	// SPECIES_OLD_UNOWN_S
+	NATIONAL_DEX_OLD_UNOWN_T,  	// SPECIES_OLD_UNOWN_T
+	NATIONAL_DEX_OLD_UNOWN_U,  	// SPECIES_OLD_UNOWN_U
+	NATIONAL_DEX_OLD_UNOWN_V,  	// SPECIES_OLD_UNOWN_V
+	NATIONAL_DEX_OLD_UNOWN_W,  	// SPECIES_OLD_UNOWN_W
+	NATIONAL_DEX_OLD_UNOWN_X,  	// SPECIES_OLD_UNOWN_X
+	NATIONAL_DEX_OLD_UNOWN_Y,  	// SPECIES_OLD_UNOWN_Y
+	NATIONAL_DEX_OLD_UNOWN_Z,  	// SPECIES_OLD_UNOWN_Z
+	NATIONAL_DEX_TREECKO,         	// SPECIES_TREECKO
+	NATIONAL_DEX_GROVYLE,         	// SPECIES_GROVYLE
+	NATIONAL_DEX_SCEPTILE,        	// SPECIES_SCEPTILE
+	NATIONAL_DEX_TORCHIC,         	// SPECIES_TORCHIC
+	NATIONAL_DEX_COMBUSKEN,       	// SPECIES_COMBUSKEN
+	NATIONAL_DEX_BLAZIKEN,        	// SPECIES_BLAZIKEN
+	NATIONAL_DEX_MUDKIP,          	// SPECIES_MUDKIP
+	NATIONAL_DEX_MARSHTOMP,       	// SPECIES_MARSHTOMP
+	NATIONAL_DEX_SWAMPERT,        	// SPECIES_SWAMPERT
+	NATIONAL_DEX_POOCHYENA,       	// SPECIES_POOCHYENA
+	NATIONAL_DEX_MIGHTYENA,       	// SPECIES_MIGHTYENA
+	NATIONAL_DEX_ZIGZAGOON,       	// SPECIES_ZIGZAGOON
+	NATIONAL_DEX_LINOONE,         	// SPECIES_LINOONE
+	NATIONAL_DEX_WURMPLE,         	// SPECIES_WURMPLE
+	NATIONAL_DEX_SILCOON,         	// SPECIES_SILCOON
+	NATIONAL_DEX_BEAUTIFLY,       	// SPECIES_BEAUTIFLY
+	NATIONAL_DEX_CASCOON,         	// SPECIES_CASCOON
+	NATIONAL_DEX_DUSTOX,          	// SPECIES_DUSTOX
+	NATIONAL_DEX_LOTAD,           	// SPECIES_LOTAD
+	NATIONAL_DEX_LOMBRE,          	// SPECIES_LOMBRE
+	NATIONAL_DEX_LUDICOLO,        	// SPECIES_LUDICOLO
+	NATIONAL_DEX_SEEDOT,          	// SPECIES_SEEDOT
+	NATIONAL_DEX_NUZLEAF,         	// SPECIES_NUZLEAF
+	NATIONAL_DEX_SHIFTRY,         	// SPECIES_SHIFTRY
+	NATIONAL_DEX_NINCADA,         	// SPECIES_NINCADA
+	NATIONAL_DEX_NINJASK,         	// SPECIES_NINJASK
+	NATIONAL_DEX_SHEDINJA,        	// SPECIES_SHEDINJA
+	NATIONAL_DEX_TAILLOW,         	// SPECIES_TAILLOW
+	NATIONAL_DEX_SWELLOW,         	// SPECIES_SWELLOW
+	NATIONAL_DEX_SHROOMISH,       	// SPECIES_SHROOMISH
+	NATIONAL_DEX_BRELOOM,         	// SPECIES_BRELOOM
+	NATIONAL_DEX_SPINDA,          	// SPECIES_SPINDA
+	NATIONAL_DEX_WINGULL,         	// SPECIES_WINGULL
+	NATIONAL_DEX_PELIPPER,        	// SPECIES_PELIPPER
+	NATIONAL_DEX_SURSKIT,         	// SPECIES_SURSKIT
+	NATIONAL_DEX_MASQUERAIN,      	// SPECIES_MASQUERAIN
+	NATIONAL_DEX_WAILMER,         	// SPECIES_WAILMER
+	NATIONAL_DEX_WAILORD,         	// SPECIES_WAILORD
+	NATIONAL_DEX_SKITTY,          	// SPECIES_SKITTY
+	NATIONAL_DEX_DELCATTY,        	// SPECIES_DELCATTY
+	NATIONAL_DEX_KECLEON,         	// SPECIES_KECLEON
+	NATIONAL_DEX_BALTOY,          	// SPECIES_BALTOY
+	NATIONAL_DEX_CLAYDOL,         	// SPECIES_CLAYDOL
+	NATIONAL_DEX_NOSEPASS,        	// SPECIES_NOSEPASS
+	NATIONAL_DEX_TORKOAL,         	// SPECIES_TORKOAL
+	NATIONAL_DEX_SABLEYE,         	// SPECIES_SABLEYE
+	NATIONAL_DEX_BARBOACH,        	// SPECIES_BARBOACH
+	NATIONAL_DEX_WHISCASH,        	// SPECIES_WHISCASH
+	NATIONAL_DEX_LUVDISC,         	// SPECIES_LUVDISC
+	NATIONAL_DEX_CORPHISH,        	// SPECIES_CORPHISH
+	NATIONAL_DEX_CRAWDAUNT,       	// SPECIES_CRAWDAUNT
+	NATIONAL_DEX_FEEBAS,          	// SPECIES_FEEBAS
+	NATIONAL_DEX_MILOTIC,         	// SPECIES_MILOTIC
+	NATIONAL_DEX_CARVANHA,        	// SPECIES_CARVANHA
+	NATIONAL_DEX_SHARPEDO,        	// SPECIES_SHARPEDO
+	NATIONAL_DEX_TRAPINCH,        	// SPECIES_TRAPINCH
+	NATIONAL_DEX_VIBRAVA,         	// SPECIES_VIBRAVA
+	NATIONAL_DEX_FLYGON,          	// SPECIES_FLYGON
+	NATIONAL_DEX_MAKUHITA,        	// SPECIES_MAKUHITA
+	NATIONAL_DEX_HARIYAMA,        	// SPECIES_HARIYAMA
+	NATIONAL_DEX_ELECTRIKE,       	// SPECIES_ELECTRIKE
+	NATIONAL_DEX_MANECTRIC,       	// SPECIES_MANECTRIC
+	NATIONAL_DEX_NUMEL,           	// SPECIES_NUMEL
+	NATIONAL_DEX_CAMERUPT,        	// SPECIES_CAMERUPT
+	NATIONAL_DEX_SPHEAL,          	// SPECIES_SPHEAL
+	NATIONAL_DEX_SEALEO,          	// SPECIES_SEALEO
+	NATIONAL_DEX_WALREIN,         	// SPECIES_WALREIN
+	NATIONAL_DEX_CACNEA,          	// SPECIES_CACNEA
+	NATIONAL_DEX_CACTURNE,        	// SPECIES_CACTURNE
+	NATIONAL_DEX_SNORUNT,         	// SPECIES_SNORUNT
+	NATIONAL_DEX_GLALIE,          	// SPECIES_GLALIE
+	NATIONAL_DEX_LUNATONE,        	// SPECIES_LUNATONE
+	NATIONAL_DEX_SOLROCK,         	// SPECIES_SOLROCK
+	NATIONAL_DEX_AZURILL,         	// SPECIES_AZURILL
+	NATIONAL_DEX_SPOINK,          	// SPECIES_SPOINK
+	NATIONAL_DEX_GRUMPIG,         	// SPECIES_GRUMPIG
+	NATIONAL_DEX_PLUSLE,          	// SPECIES_PLUSLE
+	NATIONAL_DEX_MINUN,           	// SPECIES_MINUN
+	NATIONAL_DEX_MAWILE,          	// SPECIES_MAWILE
+	NATIONAL_DEX_MEDITITE,        	// SPECIES_MEDITITE
+	NATIONAL_DEX_MEDICHAM,        	// SPECIES_MEDICHAM
+	NATIONAL_DEX_SWABLU,          	// SPECIES_SWABLU
+	NATIONAL_DEX_ALTARIA,         	// SPECIES_ALTARIA
+	NATIONAL_DEX_WYNAUT,          	// SPECIES_WYNAUT
+	NATIONAL_DEX_DUSKULL,         	// SPECIES_DUSKULL
+	NATIONAL_DEX_DUSCLOPS,        	// SPECIES_DUSCLOPS
+	NATIONAL_DEX_ROSELIA,         	// SPECIES_ROSELIA
+	NATIONAL_DEX_SLAKOTH,         	// SPECIES_SLAKOTH
+	NATIONAL_DEX_VIGOROTH,        	// SPECIES_VIGOROTH
+	NATIONAL_DEX_SLAKING,         	// SPECIES_SLAKING
+	NATIONAL_DEX_GULPIN,          	// SPECIES_GULPIN
+	NATIONAL_DEX_SWALOT,          	// SPECIES_SWALOT
+	NATIONAL_DEX_TROPIUS,         	// SPECIES_TROPIUS
+	NATIONAL_DEX_WHISMUR,         	// SPECIES_WHISMUR
+	NATIONAL_DEX_LOUDRED,         	// SPECIES_LOUDRED
+	NATIONAL_DEX_EXPLOUD,         	// SPECIES_EXPLOUD
+	NATIONAL_DEX_CLAMPERL,        	// SPECIES_CLAMPERL
+	NATIONAL_DEX_HUNTAIL,         	// SPECIES_HUNTAIL
+	NATIONAL_DEX_GOREBYSS,        	// SPECIES_GOREBYSS
+	NATIONAL_DEX_ABSOL,           	// SPECIES_ABSOL
+	NATIONAL_DEX_SHUPPET,         	// SPECIES_SHUPPET
+	NATIONAL_DEX_BANETTE,         	// SPECIES_BANETTE
+	NATIONAL_DEX_SEVIPER,         	// SPECIES_SEVIPER
+	NATIONAL_DEX_ZANGOOSE,        	// SPECIES_ZANGOOSE
+	NATIONAL_DEX_RELICANTH,       	// SPECIES_RELICANTH
+	NATIONAL_DEX_ARON,            	// SPECIES_ARON
+	NATIONAL_DEX_LAIRON,          	// SPECIES_LAIRON
+	NATIONAL_DEX_AGGRON,          	// SPECIES_AGGRON
+	NATIONAL_DEX_CASTFORM,        	// SPECIES_CASTFORM
+	NATIONAL_DEX_VOLBEAT,         	// SPECIES_VOLBEAT
+	NATIONAL_DEX_ILLUMISE,        	// SPECIES_ILLUMISE
+	NATIONAL_DEX_LILEEP,          	// SPECIES_LILEEP
+	NATIONAL_DEX_CRADILY,         	// SPECIES_CRADILY
+	NATIONAL_DEX_ANORITH,         	// SPECIES_ANORITH
+	NATIONAL_DEX_ARMALDO,         	// SPECIES_ARMALDO
+	NATIONAL_DEX_RALTS,           	// SPECIES_RALTS
+	NATIONAL_DEX_KIRLIA,          	// SPECIES_KIRLIA
+	NATIONAL_DEX_GARDEVOIR,       	// SPECIES_GARDEVOIR
+	NATIONAL_DEX_BAGON,           	// SPECIES_BAGON
+	NATIONAL_DEX_SHELGON,         	// SPECIES_SHELGON
+	NATIONAL_DEX_SALAMENCE,       	// SPECIES_SALAMENCE
+	NATIONAL_DEX_BELDUM,          	// SPECIES_BELDUM
+	NATIONAL_DEX_METANG,          	// SPECIES_METANG
+	NATIONAL_DEX_METAGROSS,       	// SPECIES_METAGROSS
+	NATIONAL_DEX_REGIROCK,        	// SPECIES_REGIROCK
+	NATIONAL_DEX_REGICE,          	// SPECIES_REGICE
+	NATIONAL_DEX_REGISTEEL,       	// SPECIES_REGISTEEL
+	NATIONAL_DEX_KYOGRE,          	// SPECIES_KYOGRE
+	NATIONAL_DEX_GROUDON,         	// SPECIES_GROUDON
+	NATIONAL_DEX_RAYQUAZA,        	// SPECIES_RAYQUAZA
+	NATIONAL_DEX_LATIAS,          	// SPECIES_LATIAS
+	NATIONAL_DEX_LATIOS,          	// SPECIES_LATIOS
+	NATIONAL_DEX_JIRACHI,         	// SPECIES_JIRACHI
+	NATIONAL_DEX_DEOXYS,          	// SPECIES_DEOXYS
+	NATIONAL_DEX_CHIMECHO         	// SPECIES_CHIMECHO
+};
+
+const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index)
+{
+	         	                // 0
+	NATIONAL_DEX_TREECKO,   	// HOENN_DEX_TREECKO
+	NATIONAL_DEX_GROVYLE,   	// HOENN_DEX_GROVYLE
+	NATIONAL_DEX_SCEPTILE,  	// HOENN_DEX_SCEPTILE
+	NATIONAL_DEX_TORCHIC,   	// HOENN_DEX_TORCHIC
+	NATIONAL_DEX_COMBUSKEN, 	// HOENN_DEX_COMBUSKEN
+	NATIONAL_DEX_BLAZIKEN,  	// HOENN_DEX_BLAZIKEN
+	NATIONAL_DEX_MUDKIP,    	// HOENN_DEX_MUDKIP
+	NATIONAL_DEX_MARSHTOMP, 	// HOENN_DEX_MARSHTOMP
+	NATIONAL_DEX_SWAMPERT,  	// HOENN_DEX_SWAMPERT	
+	NATIONAL_DEX_POOCHYENA, 	// HOENN_DEX_POOCHYENA
+	NATIONAL_DEX_MIGHTYENA, 	// HOENN_DEX_MIGHTYENA
+	NATIONAL_DEX_ZIGZAGOON, 	// HOENN_DEX_ZIGZAGOON
+	NATIONAL_DEX_LINOONE,   	// HOENN_DEX_LINOONE
+	NATIONAL_DEX_WURMPLE,   	// HOENN_DEX_WURMPLE
+	NATIONAL_DEX_SILCOON,   	// HOENN_DEX_SILCOON
+	NATIONAL_DEX_BEAUTIFLY, 	// HOENN_DEX_BEAUTIFLY
+	NATIONAL_DEX_CASCOON,   	// HOENN_DEX_CASCOON
+	NATIONAL_DEX_DUSTOX,    	// HOENN_DEX_DUSTOX
+	NATIONAL_DEX_LOTAD,     	// HOENN_DEX_LOTAD
+	NATIONAL_DEX_LOMBRE,    	// HOENN_DEX_LOMBRE
+	NATIONAL_DEX_LUDICOLO,  	// HOENN_DEX_LUDICOLO
+	NATIONAL_DEX_SEEDOT,    	// HOENN_DEX_SEEDOT
+	NATIONAL_DEX_NUZLEAF,   	// HOENN_DEX_NUZLEAF
+	NATIONAL_DEX_SHIFTRY,   	// HOENN_DEX_SHIFTRY
+	NATIONAL_DEX_TAILLOW,   	// HOENN_DEX_TAILLOW
+	NATIONAL_DEX_SWELLOW,   	// HOENN_DEX_SWELLOW
+	NATIONAL_DEX_WINGULL,   	// HOENN_DEX_WINGULL
+	NATIONAL_DEX_PELIPPER,  	// HOENN_DEX_PELIPPER
+	NATIONAL_DEX_RALTS,     	// HOENN_DEX_RALTS
+	NATIONAL_DEX_KIRLIA,    	// HOENN_DEX_KIRLIA
+	NATIONAL_DEX_GARDEVOIR, 	// HOENN_DEX_GARDEVOIR
+	NATIONAL_DEX_SURSKIT,   	// HOENN_DEX_SURSKIT
+	NATIONAL_DEX_MASQUERAIN,	// HOENN_DEX_MASQUERAIN
+	NATIONAL_DEX_SHROOMISH, 	// HOENN_DEX_SHROOMISH
+	NATIONAL_DEX_BRELOOM,   	// HOENN_DEX_BRELOOM
+	NATIONAL_DEX_SLAKOTH,   	// HOENN_DEX_SLAKOTH
+	NATIONAL_DEX_VIGOROTH,  	// HOENN_DEX_VIGOROTH
+	NATIONAL_DEX_SLAKING,   	// HOENN_DEX_SLAKING
+	NATIONAL_DEX_ABRA,       	// HOENN_DEX_ABRA
+	NATIONAL_DEX_KADABRA,    	// HOENN_DEX_KADABRA
+	NATIONAL_DEX_ALAKAZAM,   	// HOENN_DEX_ALAKAZAM
+	NATIONAL_DEX_NINCADA,   	// HOENN_DEX_NINCADA
+	NATIONAL_DEX_NINJASK,   	// HOENN_DEX_NINJASK
+	NATIONAL_DEX_SHEDINJA,  	// HOENN_DEX_SHEDINJA
+	NATIONAL_DEX_WHISMUR,   	// HOENN_DEX_WHISMUR
+	NATIONAL_DEX_LOUDRED,   	// HOENN_DEX_LOUDRED
+	NATIONAL_DEX_EXPLOUD,   	// HOENN_DEX_EXPLOUD
+	NATIONAL_DEX_MAKUHITA,  	// HOENN_DEX_MAKUHITA
+	NATIONAL_DEX_HARIYAMA,  	// HOENN_DEX_HARIYAMA
+	NATIONAL_DEX_GOLDEEN,    	// HOENN_DEX_GOLDEEN
+	NATIONAL_DEX_SEAKING,    	// HOENN_DEX_SEAKING
+	NATIONAL_DEX_MAGIKARP,   	// HOENN_DEX_MAGIKARP
+	NATIONAL_DEX_GYARADOS,   	// HOENN_DEX_GYARADOS
+	NATIONAL_DEX_AZURILL,   	// HOENN_DEX_AZURILL
+	NATIONAL_DEX_MARILL,     	// HOENN_DEX_MARILL
+	NATIONAL_DEX_AZUMARILL,  	// HOENN_DEX_AZUMARILL
+	NATIONAL_DEX_GEODUDE,    	// HOENN_DEX_GEODUDE
+	NATIONAL_DEX_GRAVELER,   	// HOENN_DEX_GRAVELER
+	NATIONAL_DEX_GOLEM,      	// HOENN_DEX_GOLEM
+	NATIONAL_DEX_NOSEPASS,  	// HOENN_DEX_NOSEPASS
+	NATIONAL_DEX_SKITTY,    	// HOENN_DEX_SKITTY
+	NATIONAL_DEX_DELCATTY,  	// HOENN_DEX_DELCATTY
+	NATIONAL_DEX_ZUBAT,      	// HOENN_DEX_ZUBAT
+	NATIONAL_DEX_GOLBAT,     	// HOENN_DEX_GOLBAT
+	NATIONAL_DEX_CROBAT,     	// HOENN_DEX_CROBAT
+	NATIONAL_DEX_TENTACOOL,  	// HOENN_DEX_TENTACOOL
+	NATIONAL_DEX_TENTACRUEL, 	// HOENN_DEX_TENTACRUEL
+	NATIONAL_DEX_SABLEYE,   	// HOENN_DEX_SABLEYE
+	NATIONAL_DEX_MAWILE,    	// HOENN_DEX_MAWILE
+	NATIONAL_DEX_ARON,      	// HOENN_DEX_ARON
+	NATIONAL_DEX_LAIRON,    	// HOENN_DEX_LAIRON
+	NATIONAL_DEX_AGGRON,    	// HOENN_DEX_AGGRON
+	NATIONAL_DEX_MACHOP,     	// HOENN_DEX_MACHOP
+	NATIONAL_DEX_MACHOKE,    	// HOENN_DEX_MACHOKE
+	NATIONAL_DEX_MACHAMP,    	// HOENN_DEX_MACHAMP
+	NATIONAL_DEX_MEDITITE,  	// HOENN_DEX_MEDITITE
+	NATIONAL_DEX_MEDICHAM,  	// HOENN_DEX_MEDICHAM
+	NATIONAL_DEX_ELECTRIKE, 	// HOENN_DEX_ELECTRIKE
+	NATIONAL_DEX_MANECTRIC, 	// HOENN_DEX_MANECTRIC
+	NATIONAL_DEX_PLUSLE,    	// HOENN_DEX_PLUSLE
+	NATIONAL_DEX_MINUN,     	// HOENN_DEX_MINUN
+	NATIONAL_DEX_MAGNEMITE,  	// HOENN_DEX_MAGNEMITE
+	NATIONAL_DEX_MAGNETON,   	// HOENN_DEX_MAGNETON
+	NATIONAL_DEX_VOLTORB,    	// HOENN_DEX_VOLTORB
+	NATIONAL_DEX_ELECTRODE,  	// HOENN_DEX_ELECTRODE
+	NATIONAL_DEX_VOLBEAT,   	// HOENN_DEX_VOLBEAT
+	NATIONAL_DEX_ILLUMISE,  	// HOENN_DEX_ILLUMISE
+	NATIONAL_DEX_ODDISH,     	// HOENN_DEX_ODDISH
+	NATIONAL_DEX_GLOOM,      	// HOENN_DEX_GLOOM
+	NATIONAL_DEX_VILEPLUME,  	// HOENN_DEX_VILEPLUME
+	NATIONAL_DEX_BELLOSSOM,  	// HOENN_DEX_BELLOSSOM
+	NATIONAL_DEX_DODUO,      	// HOENN_DEX_DODUO
+	NATIONAL_DEX_DODRIO,     	// HOENN_DEX_DODRIO
+	NATIONAL_DEX_ROSELIA,   	// HOENN_DEX_ROSELIA
+	NATIONAL_DEX_GULPIN,    	// HOENN_DEX_GULPIN
+	NATIONAL_DEX_SWALOT,    	// HOENN_DEX_SWALOT
+	NATIONAL_DEX_CARVANHA,  	// HOENN_DEX_CARVANHA
+	NATIONAL_DEX_SHARPEDO,  	// HOENN_DEX_SHARPEDO
+	NATIONAL_DEX_WAILMER,   	// HOENN_DEX_WAILMER
+	NATIONAL_DEX_WAILORD,   	// HOENN_DEX_WAILORD
+	NATIONAL_DEX_NUMEL,     	// HOENN_DEX_NUMEL
+	NATIONAL_DEX_CAMERUPT,  	// HOENN_DEX_CAMERUPT
+	NATIONAL_DEX_SLUGMA,     	// HOENN_DEX_SLUGMA
+	NATIONAL_DEX_MAGCARGO,   	// HOENN_DEX_MAGCARGO
+	NATIONAL_DEX_TORKOAL,   	// HOENN_DEX_TORKOAL
+	NATIONAL_DEX_GRIMER,     	// HOENN_DEX_GRIMER
+	NATIONAL_DEX_MUK,        	// HOENN_DEX_MUK
+	NATIONAL_DEX_KOFFING,    	// HOENN_DEX_KOFFING
+	NATIONAL_DEX_WEEZING,    	// HOENN_DEX_WEEZING
+	NATIONAL_DEX_SPOINK,    	// HOENN_DEX_SPOINK
+	NATIONAL_DEX_GRUMPIG,   	// HOENN_DEX_GRUMPIG
+	NATIONAL_DEX_SANDSHREW,  	// HOENN_DEX_SANDSHREW
+	NATIONAL_DEX_SANDSLASH,  	// HOENN_DEX_SANDSLASH
+	NATIONAL_DEX_SPINDA,    	// HOENN_DEX_SPINDA
+	NATIONAL_DEX_SKARMORY,   	// HOENN_DEX_SKARMORY
+	NATIONAL_DEX_TRAPINCH,  	// HOENN_DEX_TRAPINCH
+	NATIONAL_DEX_VIBRAVA,   	// HOENN_DEX_VIBRAVA
+	NATIONAL_DEX_FLYGON,    	// HOENN_DEX_FLYGON
+	NATIONAL_DEX_CACNEA,    	// HOENN_DEX_CACNEA
+	NATIONAL_DEX_CACTURNE,  	// HOENN_DEX_CACTURNE
+	NATIONAL_DEX_SWABLU,    	// HOENN_DEX_SWABLU
+	NATIONAL_DEX_ALTARIA,   	// HOENN_DEX_ALTARIA
+	NATIONAL_DEX_ZANGOOSE,  	// HOENN_DEX_ZANGOOSE
+	NATIONAL_DEX_SEVIPER,   	// HOENN_DEX_SEVIPER
+	NATIONAL_DEX_LUNATONE,  	// HOENN_DEX_LUNATONE
+	NATIONAL_DEX_SOLROCK,   	// HOENN_DEX_SOLROCK
+	NATIONAL_DEX_BARBOACH,  	// HOENN_DEX_BARBOACH
+	NATIONAL_DEX_WHISCASH,  	// HOENN_DEX_WHISCASH
+	NATIONAL_DEX_CORPHISH,  	// HOENN_DEX_CORPHISH
+	NATIONAL_DEX_CRAWDAUNT, 	// HOENN_DEX_CRAWDAUNT
+	NATIONAL_DEX_BALTOY,    	// HOENN_DEX_BALTOY
+	NATIONAL_DEX_CLAYDOL,   	// HOENN_DEX_CLAYDOL
+	NATIONAL_DEX_LILEEP,    	// HOENN_DEX_LILEEP
+	NATIONAL_DEX_CRADILY,   	// HOENN_DEX_CRADILY
+	NATIONAL_DEX_ANORITH,   	// HOENN_DEX_ANORITH
+	NATIONAL_DEX_ARMALDO,   	// HOENN_DEX_ARMALDO
+	NATIONAL_DEX_IGGLYBUFF, 	// HOENN_DEX_IGGLYBUFF
+	NATIONAL_DEX_JIGGLYPUFF, 	// HOENN_DEX_JIGGLYPUFF
+	NATIONAL_DEX_WIGGLYTUFF, 	// HOENN_DEX_WIGGLYTUFF
+	NATIONAL_DEX_FEEBAS,    	// HOENN_DEX_FEEBAS
+	NATIONAL_DEX_MILOTIC,   	// HOENN_DEX_MILOTIC
+	NATIONAL_DEX_CASTFORM,  	// HOENN_DEX_CASTFORM
+	NATIONAL_DEX_STARYU,     	// HOENN_DEX_STARYU
+	NATIONAL_DEX_STARMIE,    	// HOENN_DEX_STARMIE
+	NATIONAL_DEX_KECLEON,   	// HOENN_DEX_KECLEON
+	NATIONAL_DEX_SHUPPET,   	// HOENN_DEX_SHUPPET
+	NATIONAL_DEX_BANETTE,   	// HOENN_DEX_BANETTE
+	NATIONAL_DEX_DUSKULL,   	// HOENN_DEX_DUSKULL
+	NATIONAL_DEX_DUSCLOPS,  	// HOENN_DEX_DUSCLOPS
+	NATIONAL_DEX_TROPIUS,   	// HOENN_DEX_TROPIUS
+	NATIONAL_DEX_CHIMECHO,   	// HOENN_DEX_CHIMECHO
+	NATIONAL_DEX_ABSOL,     	// HOENN_DEX_ABSOL
+	NATIONAL_DEX_VULPIX,     	// HOENN_DEX_VULPIX
+	NATIONAL_DEX_NINETALES,  	// HOENN_DEX_NINETALES
+	NATIONAL_DEX_PICHU,       	// HOENN_DEX_PICHU
+	NATIONAL_DEX_PIKACHU,    	// HOENN_DEX_PIKACHU
+	NATIONAL_DEX_RAICHU,     	// HOENN_DEX_RAICHU
+	NATIONAL_DEX_PSYDUCK,    	// HOENN_DEX_PSYDUCK
+	NATIONAL_DEX_GOLDUCK,    	// HOENN_DEX_GOLDUCK
+	NATIONAL_DEX_WYNAUT,    	// HOENN_DEX_WYNAUT
+	NATIONAL_DEX_WOBBUFFET,  	// HOENN_DEX_WOBBUFFET
+	NATIONAL_DEX_NATU,       	// HOENN_DEX_NATU
+	NATIONAL_DEX_XATU,       	// HOENN_DEX_XATU
+	NATIONAL_DEX_GIRAFARIG,  	// HOENN_DEX_GIRAFARIG
+	NATIONAL_DEX_PHANPY,     	// HOENN_DEX_PHANPY
+	NATIONAL_DEX_DONPHAN,    	// HOENN_DEX_DONPHAN
+	NATIONAL_DEX_PINSIR,     	// HOENN_DEX_PINSIR
+	NATIONAL_DEX_HERACROSS,  	// HOENN_DEX_HERACROSS
+	NATIONAL_DEX_RHYHORN,    	// HOENN_DEX_RHYHORN
+	NATIONAL_DEX_RHYDON,     	// HOENN_DEX_RHYDON
+	NATIONAL_DEX_SNORUNT,   	// HOENN_DEX_SNORUNT
+	NATIONAL_DEX_GLALIE,    	// HOENN_DEX_GLALIE
+	NATIONAL_DEX_SPHEAL,    	// HOENN_DEX_SPHEAL
+	NATIONAL_DEX_SEALEO,    	// HOENN_DEX_SEALEO
+	NATIONAL_DEX_WALREIN,   	// HOENN_DEX_WALREIN
+	NATIONAL_DEX_CLAMPERL,  	// HOENN_DEX_CLAMPERL
+	NATIONAL_DEX_HUNTAIL,   	// HOENN_DEX_HUNTAIL
+	NATIONAL_DEX_GOREBYSS,  	// HOENN_DEX_GOREBYSS
+	NATIONAL_DEX_RELICANTH, 	// HOENN_DEX_RELICANTH
+	NATIONAL_DEX_CORSOLA,   	// HOENN_DEX_CORSOLA
+	NATIONAL_DEX_CHINCHOU,   	// HOENN_DEX_CHINCHOU
+	NATIONAL_DEX_LANTURN,    	// HOENN_DEX_LANTURN
+	NATIONAL_DEX_LUVDISC,   	// HOENN_DEX_LUVDISC
+	NATIONAL_DEX_HORSEA,   		// HOENN_DEX_HORSEA
+	NATIONAL_DEX_SEADRA,   		// HOENN_DEX_SEADRA
+	NATIONAL_DEX_KINGDRA,   	// HOENN_DEX_KINGDRA
+	NATIONAL_DEX_BAGON,     	// HOENN_DEX_BAGON
+	NATIONAL_DEX_SHELGON,   	// HOENN_DEX_SHELGON
+	NATIONAL_DEX_SALAMENCE, 	// HOENN_DEX_SALAMENCE
+	NATIONAL_DEX_BELDUM,    	// HOENN_DEX_BELDUM
+	NATIONAL_DEX_METANG,    	// HOENN_DEX_METANG
+	NATIONAL_DEX_METAGROSS, 	// HOENN_DEX_METAGROSS
+	NATIONAL_DEX_REGIROCK,  	// HOENN_DEX_REGIROCK
+	NATIONAL_DEX_REGICE,    	// HOENN_DEX_REGICE
+	NATIONAL_DEX_REGISTEEL, 	// HOENN_DEX_REGISTEEL
+	NATIONAL_DEX_LATIAS,    	// HOENN_DEX_LATIAS
+	NATIONAL_DEX_LATIOS,    	// HOENN_DEX_LATIOS
+	NATIONAL_DEX_KYOGRE,    	// HOENN_DEX_KYOGRE
+	NATIONAL_DEX_GROUDON,   	// HOENN_DEX_GROUDON
+	NATIONAL_DEX_RAYQUAZA,  	// HOENN_DEX_RAYQUAZA
+	NATIONAL_DEX_JIRACHI,   	// HOENN_DEX_JIRACHI
+	NATIONAL_DEX_DEOXYS,    	// HOENN_DEX_DEOXYS
+	NATIONAL_DEX_BULBASAUR,  	// HOENN_DEX_BULBASAUR - Pokémon from here onwards are UNSEEN in the Hoenn Dex.
+	NATIONAL_DEX_IVYSAUR,    	// HOENN_DEX_IVYSAUR
+	NATIONAL_DEX_VENUSAUR,   	// HOENN_DEX_VENUSAUR
+	NATIONAL_DEX_CHARMANDER, 	// HOENN_DEX_CHARMANDER
+	NATIONAL_DEX_CHARMELEON, 	// HOENN_DEX_CHARMELEON
+	NATIONAL_DEX_CHARIZARD,  	// HOENN_DEX_CHARIZARD
+	NATIONAL_DEX_SQUIRTLE,   	// HOENN_DEX_SQUIRTLE
+	NATIONAL_DEX_WARTORTLE,  	// HOENN_DEX_WARTORTLE
+	NATIONAL_DEX_BLASTOISE,  	// HOENN_DEX_BLASTOISE
+	NATIONAL_DEX_CATERPIE,   	// HOENN_DEX_CATERPIE
+	NATIONAL_DEX_METAPOD,    	// HOENN_DEX_METAPOD
+	NATIONAL_DEX_BUTTERFREE, 	// HOENN_DEX_BUTTERFREE
+	NATIONAL_DEX_WEEDLE,     	// HOENN_DEX_WEEDLE
+	NATIONAL_DEX_KAKUNA,     	// HOENN_DEX_KAKUNA
+	NATIONAL_DEX_BEEDRILL,   	// HOENN_DEX_BEEDRILL
+	NATIONAL_DEX_PIDGEY,     	// HOENN_DEX_PIDGEY
+	NATIONAL_DEX_PIDGEOTTO,  	// HOENN_DEX_PIDGEOTTO
+	NATIONAL_DEX_PIDGEOT,    	// HOENN_DEX_PIDGEOT
+	NATIONAL_DEX_RATTATA,    	// HOENN_DEX_RATTATA
+	NATIONAL_DEX_RATICATE,   	// HOENN_DEX_RATICATE
+	NATIONAL_DEX_SPEAROW,    	// HOENN_DEX_SPEAROW
+	NATIONAL_DEX_FEAROW,     	// HOENN_DEX_FEAROW
+	NATIONAL_DEX_EKANS,      	// HOENN_DEX_EKANS
+	NATIONAL_DEX_ARBOK,      	// HOENN_DEX_ARBOK
+	NATIONAL_DEX_NIDORAN_F,  	// HOENN_DEX_NIDORAN♀
+	NATIONAL_DEX_NIDORINA,   	// HOENN_DEX_NIDORINA
+	NATIONAL_DEX_NIDOQUEEN,  	// HOENN_DEX_NIDOQUEEN
+	NATIONAL_DEX_NIDORAN_M,  	// HOENN_DEX_NIDORAN♂
+	NATIONAL_DEX_NIDORINO,   	// HOENN_DEX_NIDORINO
+	NATIONAL_DEX_NIDOKING,   	// HOENN_DEX_NIDOKING
+	NATIONAL_DEX_CLEFAIRY,   	// HOENN_DEX_CLEFAIRY
+	NATIONAL_DEX_CLEFABLE,   	// HOENN_DEX_CLEFABLE
+	NATIONAL_DEX_PARAS,      	// HOENN_DEX_PARAS
+	NATIONAL_DEX_PARASECT,   	// HOENN_DEX_PARASECT
+	NATIONAL_DEX_VENONAT,    	// HOENN_DEX_VENONAT
+	NATIONAL_DEX_VENOMOTH,   	// HOENN_DEX_VENOMOTH
+	NATIONAL_DEX_DIGLETT,    	// HOENN_DEX_DIGLETT
+	NATIONAL_DEX_DUGTRIO,    	// HOENN_DEX_DUGTRIO
+	NATIONAL_DEX_MEOWTH,     	// HOENN_DEX_MEOWTH
+	NATIONAL_DEX_PERSIAN,    	// HOENN_DEX_PERSIAN
+	NATIONAL_DEX_MANKEY,     	// HOENN_DEX_MANKEY
+	NATIONAL_DEX_PRIMEAPE,   	// HOENN_DEX_PRIMEAPE
+	NATIONAL_DEX_GROWLITHE,  	// HOENN_DEX_GROWLITHE
+	NATIONAL_DEX_ARCANINE,   	// HOENN_DEX_ARCANINE
+	NATIONAL_DEX_POLIWAG,    	// HOENN_DEX_POLIWAG
+	NATIONAL_DEX_POLIWHIRL,  	// HOENN_DEX_POLIWHIRL
+	NATIONAL_DEX_POLIWRATH,  	// HOENN_DEX_POLIWRATH
+	NATIONAL_DEX_BELLSPROUT, 	// HOENN_DEX_BELLSPROUT
+	NATIONAL_DEX_WEEPINBELL, 	// HOENN_DEX_WEEPINBELL
+	NATIONAL_DEX_VICTREEBEL, 	// HOENN_DEX_VICTREEBEL
+	NATIONAL_DEX_PONYTA,     	// HOENN_DEX_PONYTA
+	NATIONAL_DEX_RAPIDASH,   	// HOENN_DEX_RAPIDASH
+	NATIONAL_DEX_SLOWPOKE,   	// HOENN_DEX_SLOWPOKE
+	NATIONAL_DEX_SLOWBRO,    	// HOENN_DEX_SLOWBRO
+	NATIONAL_DEX_FARFETCHD,  	// HOENN_DEX_FARFETCH'D
+	NATIONAL_DEX_SEEL,       	// HOENN_DEX_SEEL
+	NATIONAL_DEX_DEWGONG,    	// HOENN_DEX_DEWGONG
+	NATIONAL_DEX_SHELLDER,   	// HOENN_DEX_SHELLDER
+	NATIONAL_DEX_CLOYSTER,   	// HOENN_DEX_CLOYSTER
+	NATIONAL_DEX_GASTLY,     	// HOENN_DEX_GASTLY
+	NATIONAL_DEX_HAUNTER,    	// HOENN_DEX_HAUNTER
+	NATIONAL_DEX_GENGAR,     	// HOENN_DEX_GENGAR
+	NATIONAL_DEX_ONIX,       	// HOENN_DEX_ONIX
+	NATIONAL_DEX_DROWZEE,    	// HOENN_DEX_DROWZEE
+	NATIONAL_DEX_HYPNO,      	// HOENN_DEX_HYPNO
+	NATIONAL_DEX_KRABBY,     	// HOENN_DEX_KRABBY
+	NATIONAL_DEX_KINGLER,    	// HOENN_DEX_KINGLER
+	NATIONAL_DEX_EXEGGCUTE,  	// HOENN_DEX_EXEGGCUTE
+	NATIONAL_DEX_EXEGGUTOR,  	// HOENN_DEX_EXEGGUTOR
+	NATIONAL_DEX_CUBONE,     	// HOENN_DEX_CUBONE
+	NATIONAL_DEX_MAROWAK,    	// HOENN_DEX_MAROWAK
+	NATIONAL_DEX_HITMONLEE,  	// HOENN_DEX_HITMONLEE
+	NATIONAL_DEX_HITMONCHAN, 	// HOENN_DEX_HITMONCHAN
+	NATIONAL_DEX_LICKITUNG,  	// HOENN_DEX_LICKITUNG
+	NATIONAL_DEX_CHANSEY,    	// HOENN_DEX_CHANSEY
+	NATIONAL_DEX_TANGELA,    	// HOENN_DEX_TANGELA
+	NATIONAL_DEX_KANGASKHAN, 	// HOENN_DEX_KANGASKHAN
+	NATIONAL_DEX_MR_MIME,    	// HOENN_DEX_MR. MIME
+	NATIONAL_DEX_SCYTHER,    	// HOENN_DEX_SCYTHER
+	NATIONAL_DEX_JYNX,       	// HOENN_DEX_JYNX
+	NATIONAL_DEX_ELECTABUZZ, 	// HOENN_DEX_ELECTABUZZ
+	NATIONAL_DEX_MAGMAR,     	// HOENN_DEX_MAGMAR
+	NATIONAL_DEX_TAUROS,     	// HOENN_DEX_TAUROS
+	NATIONAL_DEX_LAPRAS,     	// HOENN_DEX_LAPRAS
+	NATIONAL_DEX_DITTO,      	// HOENN_DEX_DITTO
+	NATIONAL_DEX_EEVEE,      	// HOENN_DEX_EEVEE
+	NATIONAL_DEX_VAPOREON,   	// HOENN_DEX_VAPOREON
+	NATIONAL_DEX_JOLTEON,    	// HOENN_DEX_JOLTEON
+	NATIONAL_DEX_FLAREON,    	// HOENN_DEX_FLAREON
+	NATIONAL_DEX_PORYGON,    	// HOENN_DEX_PORYGON
+	NATIONAL_DEX_OMANYTE,    	// HOENN_DEX_OMANYTE
+	NATIONAL_DEX_OMASTAR,    	// HOENN_DEX_OMASTAR
+	NATIONAL_DEX_KABUTO,     	// HOENN_DEX_KABUTO
+	NATIONAL_DEX_KABUTOPS,   	// HOENN_DEX_KABUTOPS
+	NATIONAL_DEX_AERODACTYL, 	// HOENN_DEX_AERODACTYL
+	NATIONAL_DEX_SNORLAX,    	// HOENN_DEX_SNORLAX
+	NATIONAL_DEX_ARTICUNO,   	// HOENN_DEX_ARTICUNO
+	NATIONAL_DEX_ZAPDOS,     	// HOENN_DEX_ZAPDOS
+	NATIONAL_DEX_MOLTRES,    	// HOENN_DEX_MOLTRES
+	NATIONAL_DEX_DRATINI,    	// HOENN_DEX_DRATINI
+	NATIONAL_DEX_DRAGONAIR,  	// HOENN_DEX_DRAGONAIR
+	NATIONAL_DEX_DRAGONITE,  	// HOENN_DEX_DRAGONITE
+	NATIONAL_DEX_MEWTWO,     	// HOENN_DEX_MEWTWO
+	NATIONAL_DEX_MEW,        	// HOENN_DEX_MEW
+	NATIONAL_DEX_CHIKORITA,  	// HOENN_DEX_CHIKORITA
+	NATIONAL_DEX_BAYLEEF,    	// HOENN_DEX_BAYLEEF
+	NATIONAL_DEX_MEGANIUM,   	// HOENN_DEX_MEGANIUM
+	NATIONAL_DEX_CYNDAQUIL,  	// HOENN_DEX_CYNDAQUIL
+	NATIONAL_DEX_QUILAVA,    	// HOENN_DEX_QUILAVA
+	NATIONAL_DEX_TYPHLOSION, 	// HOENN_DEX_TYPHLOSION
+	NATIONAL_DEX_TOTODILE,   	// HOENN_DEX_TOTODILE
+	NATIONAL_DEX_CROCONAW,   	// HOENN_DEX_CROCONAW
+	NATIONAL_DEX_FERALIGATR, 	// HOENN_DEX_FERALIGATR
+	NATIONAL_DEX_SENTRET,    	// HOENN_DEX_SENTRET
+	NATIONAL_DEX_FURRET,     	// HOENN_DEX_FURRET
+	NATIONAL_DEX_HOOTHOOT,   	// HOENN_DEX_HOOTHOOT
+	NATIONAL_DEX_NOCTOWL,    	// HOENN_DEX_NOCTOWL
+	NATIONAL_DEX_LEDYBA,     	// HOENN_DEX_LEDYBA
+	NATIONAL_DEX_LEDIAN,     	// HOENN_DEX_LEDIAN
+	NATIONAL_DEX_SPINARAK,   	// HOENN_DEX_SPINARAK
+	NATIONAL_DEX_ARIADOS,    	// HOENN_DEX_ARIADOS
+	NATIONAL_DEX_CLEFFA,     	// HOENN_DEX_CLEFFA
+	NATIONAL_DEX_TOGEPI,     	// HOENN_DEX_TOGEPI
+	NATIONAL_DEX_TOGETIC,    	// HOENN_DEX_TOGETIC
+	NATIONAL_DEX_MAREEP,     	// HOENN_DEX_MAREEP
+	NATIONAL_DEX_FLAAFFY,    	// HOENN_DEX_FLAAFFY
+	NATIONAL_DEX_AMPHAROS,   	// HOENN_DEX_AMPHAROS
+	NATIONAL_DEX_SUDOWOODO,  	// HOENN_DEX_SUDOWOODO
+	NATIONAL_DEX_POLITOED,   	// HOENN_DEX_POLITOED
+	NATIONAL_DEX_HOPPIP,     	// HOENN_DEX_HOPPIP
+	NATIONAL_DEX_SKIPLOOM,   	// HOENN_DEX_SKIPLOOM
+	NATIONAL_DEX_JUMPLUFF,   	// HOENN_DEX_JUMPLUFF
+	NATIONAL_DEX_AIPOM,      	// HOENN_DEX_AIPOM
+	NATIONAL_DEX_SUNKERN,    	// HOENN_DEX_SUNKERN
+	NATIONAL_DEX_SUNFLORA,   	// HOENN_DEX_SUNFLORA
+	NATIONAL_DEX_YANMA,      	// HOENN_DEX_YANMA
+	NATIONAL_DEX_WOOPER,     	// HOENN_DEX_WOOPER
+	NATIONAL_DEX_QUAGSIRE,   	// HOENN_DEX_QUAGSIRE
+	NATIONAL_DEX_ESPEON,     	// HOENN_DEX_ESPEON
+	NATIONAL_DEX_UMBREON,    	// HOENN_DEX_UMBREON
+	NATIONAL_DEX_MURKROW,    	// HOENN_DEX_MURKROW
+	NATIONAL_DEX_SLOWKING,   	// HOENN_DEX_SLOWKING
+	NATIONAL_DEX_MISDREAVUS, 	// HOENN_DEX_MISDREAVUS
+	NATIONAL_DEX_UNOWN,      	// HOENN_DEX_UNOWN
+	NATIONAL_DEX_PINECO,     	// HOENN_DEX_PINECO
+	NATIONAL_DEX_FORRETRESS, 	// HOENN_DEX_FORRETRESS
+	NATIONAL_DEX_DUNSPARCE,  	// HOENN_DEX_DUNSPARCE
+	NATIONAL_DEX_GLIGAR,     	// HOENN_DEX_GLIGAR
+	NATIONAL_DEX_STEELIX,    	// HOENN_DEX_STEELIX
+	NATIONAL_DEX_SNUBBULL,   	// HOENN_DEX_SNUBBULL
+	NATIONAL_DEX_GRANBULL,   	// HOENN_DEX_GRANBULL
+	NATIONAL_DEX_QWILFISH,   	// HOENN_DEX_QWILFISH
+	NATIONAL_DEX_SCIZOR,     	// HOENN_DEX_SCIZOR
+	NATIONAL_DEX_SHUCKLE,    	// HOENN_DEX_SHUCKLE
+	NATIONAL_DEX_SNEASEL,    	// HOENN_DEX_SNEASEL
+	NATIONAL_DEX_TEDDIURSA,  	// HOENN_DEX_TEDDIURSA
+	NATIONAL_DEX_URSARING,   	// HOENN_DEX_URSARING
+	NATIONAL_DEX_SWINUB,     	// HOENN_DEX_SWINUB
+	NATIONAL_DEX_PILOSWINE,  	// HOENN_DEX_PILOSWINE
+	NATIONAL_DEX_REMORAID,   	// HOENN_DEX_REMORAID
+	NATIONAL_DEX_OCTILLERY,  	// HOENN_DEX_OCTILLERY
+	NATIONAL_DEX_DELIBIRD,   	// HOENN_DEX_DELIBIRD
+	NATIONAL_DEX_MANTINE,    	// HOENN_DEX_MANTINE
+	NATIONAL_DEX_HOUNDOUR,   	// HOENN_DEX_HOUNDOUR
+	NATIONAL_DEX_HOUNDOOM,   	// HOENN_DEX_HOUNDOOM
+	NATIONAL_DEX_PORYGON2,    	// HOENN_DEX_PORYGON2
+	NATIONAL_DEX_STANTLER,   	// HOENN_DEX_STANTLER
+	NATIONAL_DEX_SMEARGLE,   	// HOENN_DEX_SMEARGLE
+	NATIONAL_DEX_TYROGUE,    	// HOENN_DEX_TYROGUE
+	NATIONAL_DEX_HITMONTOP,  	// HOENN_DEX_HITMONTOP
+	NATIONAL_DEX_SMOOCHUM,   	// HOENN_DEX_SMOOCHUM
+	NATIONAL_DEX_ELEKID,     	// HOENN_DEX_ELEKID
+	NATIONAL_DEX_MAGBY,      	// HOENN_DEX_MAGBY
+	NATIONAL_DEX_MILTANK,    	// HOENN_DEX_MILTANK
+	NATIONAL_DEX_BLISSEY,    	// HOENN_DEX_BLISSEY
+	NATIONAL_DEX_RAIKOU,     	// HOENN_DEX_RAIKOU
+	NATIONAL_DEX_ENTEI,      	// HOENN_DEX_ENTEI
+	NATIONAL_DEX_SUICUNE,    	// HOENN_DEX_SUICUNE
+	NATIONAL_DEX_LARVITAR,   	// HOENN_DEX_LARVITAR
+	NATIONAL_DEX_PUPITAR,    	// HOENN_DEX_PUPITAR
+	NATIONAL_DEX_TYRANITAR,  	// HOENN_DEX_TYRANITAR
+	NATIONAL_DEX_LUGIA,      	// HOENN_DEX_LUGIA
+	NATIONAL_DEX_HO_OH,      	// HOENN_DEX_HO-OH
+	NATIONAL_DEX_CELEBI,     	// HOENN_DEX_CELEBI
+	NATIONAL_DEX_OLD_UNOWN_B,  	// HOENN_DEX_OLD_UNOWN_B
+	NATIONAL_DEX_OLD_UNOWN_C,  	// HOENN_DEX_OLD_UNOWN_C
+	NATIONAL_DEX_OLD_UNOWN_D,  	// HOENN_DEX_OLD_UNOWN_D
+	NATIONAL_DEX_OLD_UNOWN_E,  	// HOENN_DEX_OLD_UNOWN_E
+	NATIONAL_DEX_OLD_UNOWN_F,  	// HOENN_DEX_OLD_UNOWN_F
+	NATIONAL_DEX_OLD_UNOWN_G,  	// HOENN_DEX_OLD_UNOWN_G
+	NATIONAL_DEX_OLD_UNOWN_H,  	// HOENN_DEX_OLD_UNOWN_H
+	NATIONAL_DEX_OLD_UNOWN_I,  	// HOENN_DEX_OLD_UNOWN_I
+	NATIONAL_DEX_OLD_UNOWN_J,  	// HOENN_DEX_OLD_UNOWN_J
+	NATIONAL_DEX_OLD_UNOWN_K,  	// HOENN_DEX_OLD_UNOWN_K
+	NATIONAL_DEX_OLD_UNOWN_L,  	// HOENN_DEX_OLD_UNOWN_L
+	NATIONAL_DEX_OLD_UNOWN_M,  	// HOENN_DEX_OLD_UNOWN_M
+	NATIONAL_DEX_OLD_UNOWN_N,  	// HOENN_DEX_OLD_UNOWN_N
+	NATIONAL_DEX_OLD_UNOWN_O,  	// HOENN_DEX_OLD_UNOWN_O
+	NATIONAL_DEX_OLD_UNOWN_P,  	// HOENN_DEX_OLD_UNOWN_P
+	NATIONAL_DEX_OLD_UNOWN_Q,  	// HOENN_DEX_OLD_UNOWN_Q
+	NATIONAL_DEX_OLD_UNOWN_R,  	// HOENN_DEX_OLD_UNOWN_R
+	NATIONAL_DEX_OLD_UNOWN_S,  	// HOENN_DEX_OLD_UNOWN_S
+	NATIONAL_DEX_OLD_UNOWN_T,  	// HOENN_DEX_OLD_UNOWN_T
+	NATIONAL_DEX_OLD_UNOWN_U,  	// HOENN_DEX_OLD_UNOWN_U
+	NATIONAL_DEX_OLD_UNOWN_V,  	// HOENN_DEX_OLD_UNOWN_V
+	NATIONAL_DEX_OLD_UNOWN_W,  	// HOENN_DEX_OLD_UNOWN_W
+	NATIONAL_DEX_OLD_UNOWN_X,  	// HOENN_DEX_OLD_UNOWN_X
+	NATIONAL_DEX_OLD_UNOWN_Y,  	// HOENN_DEX_OLD_UNOWN_Y
+	NATIONAL_DEX_OLD_UNOWN_Z,  	// HOENN_DEX_OLD_UNOWN_Z
+};
 
 const struct SpindaSpot gSpindaSpotGraphics[] =
 {
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 2cd1a59c6..6ebb8ff8a 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -337,7 +337,7 @@ void debug_sub_80A4300(void)
 extern void (*unk_2038794)(void);
 extern struct Pokemon * unk_2038798;
 
-extern void debug_sub_809CB94(struct Pokemon *);
+extern void sub_809CB94(struct Pokemon *);
 
 void debug_sub_80A433C(struct Pokemon * a, void (*b)(void))
 {
@@ -351,7 +351,7 @@ void debug_sub_80A435C(void)
     switch (gPokemonStorageSystemPtr->unk_0004)
     {
     case 0:
-        debug_sub_809CB94(unk_2038798);
+        sub_809CB94(unk_2038798);
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
         gPokemonStorageSystemPtr->unk_0004++;
         break;
diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c
index da26c6fc5..cbac7a504 100644
--- a/src/pokemon_storage_system_3.c
+++ b/src/pokemon_storage_system_3.c
@@ -23,6 +23,35 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite);
 // .rodata
 
 const struct OamData gOamData_83B6F2C;
+const struct SpriteTemplate gSpriteTemplate_83B6F14 = {
+    0x000f,
+    0xdac0,
+    &gOamData_83B6F2C,
+    gDummySpriteAnimTable,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct OamData gOamData_83B6F2C = {
+    .size = 2
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = {
+    AFFINEANIMCMD_FRAME(-2, -2, 0, 120),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = {
+    AFFINEANIMCMD_FRAME(16, 16, 0,  0),
+    AFFINEANIMCMD_FRAME(16, 16, 0, 15),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = {
+    gSpriteAffineAnim_83B6F34,
+    gSpriteAffineAnim_83B6F44
+};
 
 // .text
 
@@ -481,8 +510,6 @@ bool8 sub_809971C(void)
     return TRUE;
 }
 
-const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[];
-
 void sub_809981C(u8 mode, u8 idx)
 {
     switch (mode)
@@ -599,15 +626,7 @@ static void PSS_ForgetSpeciesIcon(u16 a0)
 
 static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority)
 {
-    struct SpriteTemplate template = {
-        0x000f,
-        0xdac0,
-        &gOamData_83B6F2C,
-        gDummySpriteAnimTable,
-        NULL,
-        gDummySpriteAffineAnimTable,
-        SpriteCallbackDummy
-    };
+    struct SpriteTemplate template = gSpriteTemplate_83B6F14;
     u16 tileNum;
     u8 spriteId;
 
@@ -633,23 +652,3 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite)
     PSS_ForgetSpeciesIcon(sprite->data[0]);
     DestroySprite(sprite);
 }
-
-const struct OamData gOamData_83B6F2C = {
-    .size = 2
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = {
-    AFFINEANIMCMD_FRAME(-2, -2, 0, 120),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = {
-    AFFINEANIMCMD_FRAME(16, 16, 0,  0),
-    AFFINEANIMCMD_FRAME(16, 16, 0, 15),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = {
-    gSpriteAffineAnim_83B6F34,
-    gSpriteAffineAnim_83B6F44
-};
diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c
index 2d156c159..fff545492 100644
--- a/src/pokemon_storage_system_4.c
+++ b/src/pokemon_storage_system_4.c
@@ -26,7 +26,7 @@ struct WallpaperTable {
 
 EWRAM_DATA struct Pokemon gUnknown_02038480 = {};
 #if DEBUG
-EWRAM_DATA u32 unk_2038790 = 0;
+EWRAM_DATA u8 unk_2038790 = 0;
 EWRAM_DATA u32 unk_2038794 = 0;
 EWRAM_DATA u32 unk_2038798 = 0;
 #endif
@@ -37,6 +37,7 @@ EWRAM_DATA u8 gUnknown_020384E7 = 0;
 EWRAM_DATA u8 gUnknown_020384E8 = 0;
 EWRAM_DATA u8 gUnknown_020384E9 = 0;
 EWRAM_DATA u8 gUnknown_020384EA = 0;
+EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL;
 
 // Static ROM declarations
 
@@ -76,6 +77,9 @@ bool8 sub_809CAB0(void);
 void sub_809CC04(void);
 void sub_809CD88(void);
 s8 sub_809CE4C(u8 a0);
+void sub_809CA8C(void);
+void sub_809D0BC(struct UnkStruct_2000028*);
+void sub_809D1C4(struct UnkStruct_2000028*);
 
 // .rodata
 
@@ -325,6 +329,14 @@ bool8 (*const gUnknown_083BBBC8[])(void) = {
     sub_809B1D8,
     sub_809B24C
 };
+
+extern const struct SpriteSheet gHandCursorSpriteSheets[3];
+extern const struct SpritePalette gHandCursorSpritePalettes[3];
+extern const struct SpriteTemplate gSpriteTemplate_83BBC70;
+extern const struct SpriteTemplate gSpriteTemplate_83BBC88;
+extern const u8 *const gUnknown_083BBCA0[];
+extern struct PokemonStorageSystemFunc gUnknown_083BBBD4[];
+
 // .text
 
 void sub_8099BF8(u8 boxId)
@@ -2847,3 +2859,744 @@ NAKED u8 sub_809C664(void)
                     "\tbx r1");
 }
 #endif
+
+u8 sub_809C85C(void)
+{
+    u8 retVal;
+    s8 var0;
+    register s8 var1 asm("r5"); // FAKEMATCHING: r5 and r6 become swapped without this register hack
+
+    gPokemonStorageSystemPtr->unk_11df = 0;
+    gPokemonStorageSystemPtr->unk_11de = 0;
+    gPokemonStorageSystemPtr->unk_11e3 = 0;
+
+    if (!(gMain.newAndRepeatedKeys & DPAD_UP))
+    {
+        if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+        {
+            retVal = 1;
+            var0 = 0;
+            var1 = 2;
+        }
+        else
+        {
+            if (gMain.heldKeys & DPAD_LEFT)
+                return 10;
+            if (gMain.heldKeys & DPAD_RIGHT)
+                return 9;
+            if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)
+            {
+                if (gMain.heldKeys & L_BUTTON)
+                    return 10;
+                if (gMain.heldKeys & R_BUTTON)
+                    return 9;
+            }
+
+            if (gMain.newKeys & A_BUTTON)
+            {
+                sub_809A860(0);
+                sub_809CA8C();
+                return 7;
+            }
+
+            if (gMain.newKeys & B_BUTTON)
+                return 16;
+
+            if (gMain.newKeys & SELECT_BUTTON)
+            {
+                sub_809CD88();
+                return 0;
+            }
+
+            retVal = 0;
+        }
+    }
+    else
+    {
+        retVal = 1;
+        var0 = 3;
+        var1 = 0;
+        gPokemonStorageSystemPtr->unk_11e3 = 1;
+    }
+
+    if (retVal)
+    {
+        if (var0 != 2)
+            sub_809A860(0);
+        sub_809AF18(var0, var1);
+        return retVal;
+    }
+
+    return retVal;
+}
+
+#ifdef NONMATCHING
+u8 sub_809C944(void)
+{
+    u8 r6;
+    s8 var0 = gUnknown_020384E4;
+    s8 var1 = gUnknown_020384E5;
+
+    gPokemonStorageSystemPtr->unk_11df = 0;
+    gPokemonStorageSystemPtr->unk_11de = 0;
+    gPokemonStorageSystemPtr->unk_11e3 = 0;
+
+    if (!(gMain.newAndRepeatedKeys & DPAD_UP))
+    {
+        if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON))
+        {
+            r6 = 1;
+            var0 = 2;
+            var1 = 0;
+            gPokemonStorageSystemPtr->unk_11e3 = 1;
+        }
+        else if (gMain.newAndRepeatedKeys & DPAD_LEFT)
+        {
+            r6 = 1;
+            var1 -= 1;
+            if (var1 < 0)
+            {
+                gPokemonStorageSystemPtr->unk_11df = -1;
+                var1 = 1;
+            }
+        }
+        else if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
+        {
+            r6 = 1;
+            var1 += 1;
+            if (var1 > 1)
+            {
+                gPokemonStorageSystemPtr->unk_11df = 1;
+                var1 = 0;
+            }
+        }
+        else if (gMain.newKeys & A_BUTTON)
+        {
+            return var1 == 0 ? 5 : 4;
+        }
+        else if (gMain.newKeys & B_BUTTON)
+        {
+            return 16;
+        }
+        else if (gMain.newKeys & SELECT_BUTTON)
+        {
+            sub_809CD88();
+            return 0;
+        }
+        else
+        {
+            r6 = 0;
+        }
+    }
+    else
+    {
+        r6 = 1;
+        var0 = 0;
+        gPokemonStorageSystemPtr->unk_11de = -1;
+        var1 = !gUnknown_020384E5 ? 24 : 29;
+        gPokemonStorageSystemPtr->unk_11e3 = 1;
+    }
+
+    if (r6)
+    {
+        sub_809AF18(var0, var1);
+    }
+
+    return r6;
+}
+#else
+NAKED
+u8 sub_809C944(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    ldr r0, _0809C988 @ =gUnknown_020384E4\n\
+    ldrb r0, [r0]\n\
+    mov r12, r0\n\
+    ldr r7, _0809C98C @ =gUnknown_020384E5\n\
+    ldrb r3, [r7]\n\
+    ldr r0, _0809C990 @ =gPokemonStorageSystemPtr\n\
+    ldr r1, [r0]\n\
+    ldr r0, _0809C994 @ =0x000011df\n\
+    adds r5, r1, r0\n\
+    movs r0, 0\n\
+    strb r0, [r5]\n\
+    ldr r2, _0809C998 @ =0x000011de\n\
+    adds r4, r1, r2\n\
+    strb r0, [r4]\n\
+    adds r2, 0x5\n\
+    adds r1, r2\n\
+    strb r0, [r1]\n\
+    ldr r6, _0809C99C @ =gMain\n\
+    ldrh r2, [r6, 0x30]\n\
+    movs r0, 0x40\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    bne _0809CA14\n\
+    movs r0, 0x88\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0809C9A0\n\
+    movs r6, 0x1\n\
+    movs r0, 0x2\n\
+    mov r12, r0\n\
+    movs r3, 0\n\
+    b _0809CA2A\n\
+    .align 2, 0\n\
+_0809C988: .4byte gUnknown_020384E4\n\
+_0809C98C: .4byte gUnknown_020384E5\n\
+_0809C990: .4byte gPokemonStorageSystemPtr\n\
+_0809C994: .4byte 0x000011df\n\
+_0809C998: .4byte 0x000011de\n\
+_0809C99C: .4byte gMain\n\
+_0809C9A0:\n\
+    movs r0, 0x20\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0809C9C0\n\
+    movs r6, 0x1\n\
+    lsls r0, r3, 24\n\
+    movs r1, 0xFF\n\
+    lsls r1, 24\n\
+    adds r0, r1\n\
+    lsrs r3, r0, 24\n\
+    cmp r0, 0\n\
+    bge _0809CA2C\n\
+    movs r0, 0xFF\n\
+    strb r0, [r5]\n\
+    movs r3, 0x1\n\
+    b _0809CA2C\n\
+_0809C9C0:\n\
+    movs r0, 0x10\n\
+    ands r0, r2\n\
+    cmp r0, 0\n\
+    beq _0809C9E0\n\
+    movs r6, 0x1\n\
+    lsls r0, r3, 24\n\
+    movs r2, 0x80\n\
+    lsls r2, 17\n\
+    adds r0, r2\n\
+    lsrs r3, r0, 24\n\
+    asrs r0, 24\n\
+    cmp r0, 0x1\n\
+    ble _0809CA2C\n\
+    strb r6, [r5]\n\
+    movs r3, 0\n\
+    b _0809CA2C\n\
+_0809C9E0:\n\
+    ldrh r1, [r6, 0x2E]\n\
+    movs r0, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809C9F4\n\
+    movs r0, 0x4\n\
+    cmp r3, 0\n\
+    bne _0809CA3A\n\
+    movs r0, 0x5\n\
+    b _0809CA3A\n\
+_0809C9F4:\n\
+    movs r0, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809CA00\n\
+    movs r0, 0x10\n\
+    b _0809CA3A\n\
+_0809CA00:\n\
+    movs r0, 0x4\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809CA10\n\
+    bl sub_809CD88\n\
+    movs r0, 0\n\
+    b _0809CA3A\n\
+_0809CA10:\n\
+    movs r6, 0\n\
+    b _0809CA38\n\
+_0809CA14:\n\
+    movs r6, 0x1\n\
+    movs r0, 0\n\
+    mov r12, r0\n\
+    movs r0, 0xFF\n\
+    strb r0, [r4]\n\
+    movs r0, 0\n\
+    ldrsb r0, [r7, r0]\n\
+    movs r3, 0x1D\n\
+    cmp r0, 0\n\
+    bne _0809CA2A\n\
+    movs r3, 0x18\n\
+_0809CA2A:\n\
+    strb r6, [r1]\n\
+_0809CA2C:\n\
+    cmp r6, 0\n\
+    beq _0809CA38\n\
+    mov r0, r12\n\
+    adds r1, r3, 0\n\
+    bl sub_809AF18\n\
+_0809CA38:\n\
+    adds r0, r6, 0\n\
+_0809CA3A:\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+u8 sub_809CA40(void)
+{
+    u16 i = 0;
+    while (gUnknown_083BBBD4[i].func != NULL)
+    {
+        if (gUnknown_083BBBD4[i].unk4 == gUnknown_020384E4)
+            return gUnknown_083BBBD4[i].func();
+        i++;
+    }
+
+    return 0;
+}
+
+void sub_809CA8C(void)
+{
+    sub_809CDCC();
+    sub_809CDEC(9);
+    sub_809CDEC(10);
+    sub_809CDEC(11);
+    sub_809CDEC(0);
+}
+
+#if DEBUG
+u8 debug_sub_80AA40C(void)
+{
+    if (!sub_809AB8C())
+        return 0;
+
+    sub_809CDCC();
+    sub_809CDEC(32);
+    sub_809CDEC(6);
+    return 1;
+}
+#endif
+
+bool8 sub_809CAB0(void)
+{
+    u16 var0;
+
+#if DEBUG
+    if (unk_2038790)
+        return debug_sub_80AA40C();
+#endif
+
+    sub_809CDCC();
+    var0 = sub_809AB8C();
+
+    switch (gPokemonStorageSystemPtr->unk_0005)
+    {
+    case 1:
+        if (var0)
+            sub_809CDEC(1);
+        else
+            return 0;
+        break;
+    case 0:
+        if (var0)
+            sub_809CDEC(2);
+        else
+            return 0;
+        break;
+    case 2:
+        if (gUnknown_020384E6)
+        {
+            if (var0)
+                sub_809CDEC(4);
+            else
+                sub_809CDEC(5);
+        }
+        else
+        {
+            if (var0)
+                sub_809CDEC(3);
+            else
+                return 0;
+        }
+        break;
+    default:
+        return 0;
+    }
+
+    sub_809CDEC(6);
+    if (gPokemonStorageSystemPtr->unk_0005 == 2)
+    {
+        if (!gUnknown_020384E4)
+            sub_809CDEC(2);
+        else
+            sub_809CDEC(1);
+    }
+
+    sub_809CDEC(8);
+    sub_809CDEC(7);
+    sub_809CDEC(0);
+    return 1;
+}
+
+void sub_809CB74(struct Sprite *sprite)
+{
+    sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x;
+    sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20;
+}
+
+void sub_809CB94(struct Pokemon *mon)
+{
+    if (gUnknown_020384E4 == 1)
+    {
+        mon->box = gPlayerParty[gUnknown_020384E5].box;
+    }
+    else
+    {
+        u8 boxId = get_preferred_box();
+        mon->box = gPokemonStorage.boxes[boxId][gUnknown_020384E5];
+    }
+}
+
+void sub_809CC04(void)
+{
+    u16 x, y;
+    u8 spriteId;
+    int priority, subpriority;
+    struct SpriteSheet spriteSheets[3];
+    struct SpritePalette spritePalettes[3];
+
+    memcpy(spriteSheets, gHandCursorSpriteSheets, 24);
+    memcpy(spritePalettes, gHandCursorSpritePalettes, 24);
+    LoadSpriteSheets(spriteSheets);
+    LoadSpritePalettes(spritePalettes);
+    gPokemonStorageSystemPtr->unk_11e4[0] = IndexOfSpritePaletteTag(0xDAC6);
+    gPokemonStorageSystemPtr->unk_11e4[1] = IndexOfSpritePaletteTag(0xDAD1);
+
+    sub_809AACC(gUnknown_020384E4, gUnknown_020384E5, &x, &y);
+    spriteId = CreateSprite(&gSpriteTemplate_83BBC70, x, y, 6);
+    if (spriteId != MAX_SPRITES)
+    {
+        gPokemonStorageSystemPtr->unk_11c0 = &gSprites[spriteId];
+        gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9];
+        if (gUnknown_020384E6)
+            StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3);
+    }
+    else
+    {
+        gPokemonStorageSystemPtr->unk_11c0 = NULL;
+    }
+
+    if (gUnknown_020384E4 == 1)
+    {
+        subpriority = 12;
+        priority = 1;
+    }
+    else
+    {
+        subpriority = 20;
+        priority = 2;
+    }
+
+    spriteId = CreateSprite(&gSpriteTemplate_83BBC88, 0, 0, subpriority);
+    if (spriteId != MAX_SPRITES)
+    {
+        gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId];
+        gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority;
+        if (gUnknown_020384E4)
+            gPokemonStorageSystemPtr->unk_11c4->invisible = 1;
+    }
+    else
+    {
+        gPokemonStorageSystemPtr->unk_11c4 = NULL;
+    }
+}
+
+void sub_809CD88(void)
+{
+    gUnknown_020384E9 = !gUnknown_020384E9;
+    gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9];
+}
+
+void sub_809CDCC(void)
+{
+    gPokemonStorageSystemPtr->unk_11b8 = 0;
+    gPokemonStorageSystemPtr->unk_11b9 = 0;
+}
+
+void sub_809CDEC(u8 arg0)
+{
+    u8 width;
+    u8 var0;
+
+    if (gPokemonStorageSystemPtr->unk_11b8 < 7)
+    {
+        struct StorageText *storageText = &gPokemonStorageSystemPtr->unk_1180[gPokemonStorageSystemPtr->unk_11b8];
+        storageText->text = gUnknown_083BBCA0[arg0];
+        storageText->textId = arg0;
+        width = GetStringWidthInMenuWindow(storageText->text);
+        var0 = (width + 7) / 8;
+        if (var0 > gPokemonStorageSystemPtr->unk_11b9)
+            gPokemonStorageSystemPtr->unk_11b9 = var0;
+
+        gPokemonStorageSystemPtr->unk_11b8++;
+    }
+}
+
+s8 sub_809CE4C(u8 arg0)
+{
+    if (arg0 >= gPokemonStorageSystemPtr->unk_11b8)
+        return -1;
+    else
+        return gPokemonStorageSystemPtr->unk_1180[arg0].textId;
+}
+
+void sub_809CE84(void)
+{
+    gPokemonStorageSystemPtr->unk_11bc = 14 - gPokemonStorageSystemPtr->unk_11b8 * 2;
+    gPokemonStorageSystemPtr->unk_11ba = 28 - gPokemonStorageSystemPtr->unk_11b9;
+    Menu_DrawStdWindowFrame(gPokemonStorageSystemPtr->unk_11ba, gPokemonStorageSystemPtr->unk_11bc, 29, 15);
+    Menu_PrintItems(
+        gPokemonStorageSystemPtr->unk_11ba + 1,
+        gPokemonStorageSystemPtr->unk_11bc + 1,
+        gPokemonStorageSystemPtr->unk_11b8,
+        gPokemonStorageSystemPtr->unk_1180);
+    InitMenu(
+        0,
+        gPokemonStorageSystemPtr->unk_11ba + 1,
+        gPokemonStorageSystemPtr->unk_11bc + 1,
+        gPokemonStorageSystemPtr->unk_11b8,
+        0,
+        gPokemonStorageSystemPtr->unk_11b9);
+}
+
+#ifdef NONMATCHING // r4 and r5 are swapped throughout the entire function.
+s16 sub_809CF30(void)
+{
+    int textId = -2;
+
+    if (!(gMain.newKeys & A_BUTTON))
+    {
+        if (gMain.newKeys & B_BUTTON)
+        {
+            PlaySE(5);
+            textId++;
+        }
+
+        if (gMain.newKeys & DPAD_UP)
+        {
+            PlaySE(5);
+            Menu_MoveCursor(-1);
+        }
+        else if (gMain.newKeys & DPAD_DOWN)
+        {
+            PlaySE(5);
+            Menu_MoveCursor(1);
+        }
+    }
+    else
+    {
+        textId = Menu_GetCursorPos();
+    }
+
+    if (textId != -2)
+    {
+        Menu_DestroyCursor();
+        Menu_EraseWindowRect(
+            gPokemonStorageSystemPtr->unk_11ba,
+            gPokemonStorageSystemPtr->unk_11bc,
+            29,
+            15);
+    }
+
+    if (textId >= 0)
+    {
+        textId = gPokemonStorageSystemPtr->unk_1180[textId].textId;
+    }
+
+    return textId;
+}
+#else
+NAKED
+s16 sub_809CF30(void)
+{
+    asm(".syntax unified\n\
+    push {r4,r5,lr}\n\
+    movs r5, 0x2\n\
+    negs r5, r5\n\
+    ldr r4, _0809CF6C @ =gMain\n\
+    ldrh r1, [r4, 0x2E]\n\
+    movs r0, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _0809CF86\n\
+    movs r0, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809CF52\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    adds r5, 0x1\n\
+_0809CF52:\n\
+    ldrh r1, [r4, 0x2E]\n\
+    movs r0, 0x40\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809CF70\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x1\n\
+    negs r0, r0\n\
+    bl Menu_MoveCursor\n\
+    b _0809CF8E\n\
+    .align 2, 0\n\
+_0809CF6C: .4byte gMain\n\
+_0809CF70:\n\
+    movs r0, 0x80\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0809CF8E\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x1\n\
+    bl Menu_MoveCursor\n\
+    b _0809CF8E\n\
+_0809CF86:\n\
+    bl Menu_GetCursorPos\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+_0809CF8E:\n\
+    movs r0, 0x2\n\
+    negs r0, r0\n\
+    cmp r5, r0\n\
+    beq _0809CFB2\n\
+    bl Menu_DestroyCursor\n\
+    ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\
+    ldr r1, [r0]\n\
+    ldr r2, _0809CFD4 @ =0x000011ba\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    adds r2, 0x2\n\
+    adds r1, r2\n\
+    ldrb r1, [r1]\n\
+    movs r2, 0x1D\n\
+    movs r3, 0xF\n\
+    bl Menu_EraseWindowRect\n\
+_0809CFB2:\n\
+    cmp r5, 0\n\
+    blt _0809CFC4\n\
+    ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\
+    ldr r0, [r0]\n\
+    lsls r1, r5, 3\n\
+    ldr r2, _0809CFD8 @ =0x00001184\n\
+    adds r0, r2\n\
+    adds r0, r1\n\
+    ldr r5, [r0]\n\
+_0809CFC4:\n\
+    lsls r0, r5, 16\n\
+    asrs r0, 16\n\
+    pop {r4,r5}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
+_0809CFD0: .4byte gPokemonStorageSystemPtr\n\
+_0809CFD4: .4byte 0x000011ba\n\
+_0809CFD8: .4byte 0x00001184\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+void sub_809CFDC(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u8 arg2)
+{
+    gUnknown_020384EC = arg0;
+    arg0->unk_00 = arg1;
+    arg0->unk_05 = arg2;
+    arg0->unk_04 = 0;
+}
+
+void sub_809CFF0(void)
+{
+    u16 i;
+    struct UnkStruct_2000028 *unkStruct;
+
+    if (gUnknown_020384EC->unk_04)
+    {
+        for (i = 0; i < gUnknown_020384EC->unk_04; i++)
+        {
+            unkStruct = &gUnknown_020384EC->unk_00[i];
+            unkStruct->unk_0c(unkStruct);
+        }
+
+        gUnknown_020384EC->unk_04 = 0;
+    }
+}
+
+bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height)
+{
+    struct UnkStruct_2000028 *unkStruct;
+
+    if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05)
+        return FALSE;
+
+    unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++];
+    unkStruct->unk_08 = width * 2;
+    unkStruct->unk_04 = dest + (dTop * 64) + (dLeft * 2);
+    unkStruct->unk_00 = src + (sTop * 64) + (sLeft * 2);
+    unkStruct->unk_0a = height;
+    unkStruct->unk_0c = sub_809D0BC;
+    return TRUE;
+}
+
+void sub_809D0BC(struct UnkStruct_2000028 *unkStruct)
+{
+    u32 i;
+    const u8 *src = unkStruct->unk_00;
+    u8 *dest = unkStruct->unk_04;
+    int height = unkStruct->unk_0a;
+    int width = unkStruct->unk_08;
+    for (i = 0; i < height; i++)
+    {
+        CpuSet(src, dest, (width / 2) & 0x1FFFFF);
+        dest += 64;
+        src += 64;
+    }
+}
+
+void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height)
+{
+    const u8 *from = src + (sTop * 64) + (sLeft * 2);
+    u8 *to = dest + (dTop * 64) + (dLeft * 2);
+    u8 *end = dest + (dTop + height) * 64;
+    int width2 = width * 2;
+    while (to < end)
+    {
+        CpuSet(from, to, (width2 / 2) & 0x1FFFFF);
+        to += 64;
+        from += 64;
+    }
+}
+
+bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height)
+{
+    struct UnkStruct_2000028 *unkStruct;
+
+    if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05)
+        return FALSE;
+
+    unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++];
+    unkStruct->unk_08 = width * 2;
+    unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2;
+    unkStruct->unk_0a = height;
+    unkStruct->unk_0c = sub_809D1C4;
+    return TRUE;
+}
+
+void sub_809D1C4(struct UnkStruct_2000028 *unkStruct)
+{
+    u16 i;
+
+    for (i = 0; i < unkStruct->unk_0a; i++)
+    {
+        Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16);
+        unkStruct->unk_04 += 64;
+    }
+}
diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c
deleted file mode 100644
index b7c3d42f5..000000000
--- a/src/pokemon_storage_system_5.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-// Includes
-#include "global.h"
-#include "pokemon_storage_system.h"
-
-// Static type declarations
-
-// Static RAM declarations
-
-EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL;
-
-// Static ROM declarations
-
-// .rodata
-
-// .text
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 2fd7cb1ca..fe908de03 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -4778,7 +4778,7 @@ static void sub_80A1DCC(struct Pokemon *mon)
 static void sub_80A1DE8(struct Pokemon *mon)
 {
     u8 ball = ball_number_to_ball_processing_index(GetMonData(mon, MON_DATA_POKEBALL));
-    sub_80478DC(ball);
+    LoadBallGraphics(ball);
 
     pssData.ballSpriteId = CreateSprite(&gBallSpriteTemplates[ball], 6, 136, 0);
     gSprites[pssData.ballSpriteId].callback = SpriteCallbackDummy;
diff --git a/src/pokenav_after.c b/src/pokenav_after.c
index 330305ea3..7619577cc 100644
--- a/src/pokenav_after.c
+++ b/src/pokenav_after.c
@@ -3,6 +3,7 @@
 #include "pokenav.h"
 #include "battle.h"
 #include "data2.h"
+#include "text.h"
 #include "de_rom_8040FE0.h"
 #include "string_util.h"
 
@@ -20,14 +21,14 @@ void sub_80F700C(u8 *arg0, u16 arg1)
         ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0));
 #endif
 
-        ptr[0] = 0xFC;
+        ptr[0] = EXT_CTRL_CODE_BEGIN;
         ptr[1] = 0x13;
         ptr[2] = 0x4B;
         ptr += 3;
         ptr = StringCopy(ptr, trainer->trainerName);
     }
 
-    ptr[0] = 0xFC;
+    ptr[0] = EXT_CTRL_CODE_BEGIN;
     ptr[1] = 0x13;
     ptr[2] = 0x80;
     ptr[3] = 0xFF;
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 49df4863e..8ae582222 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -15,10 +15,16 @@
 #include "region_map.h"
 #include "constants/songs.h"
 #include "string_util.h"
+#include "strings.h"
 #include "sound.h"
 #include "task.h"
 #include "text.h"
+#include "trig.h"
 #include "scanline_effect.h"
+#include "pokemon_storage_system.h"
+#include "pokemon_summary_screen.h"
+#include "use_pokeblock.h"
+#include "constants/game_stat.h"
 
 struct UnknownPokenav0
 {
@@ -86,6 +92,11 @@ struct UnknownPokenav0_1 {
     s8 var6dae;
 };
 
+struct PokenavRibbonIconGfx {
+    u16 baseTile;
+    u8 paletteNum;
+};
+
 IWRAM_DATA void (*gUnknown_03000744)(void);
 
 extern const u8 gUnknown_083E0314[];
@@ -128,6 +139,77 @@ extern const u8 gPokenavHoennMapMisc_Gfx[];
 extern const u8 gUnknown_08E99FB0[];
 extern const u8 gUnknown_08E9A100[];
 extern const u16 gPokenavHoennMap1_Pal[];
+extern void (*const gUnknown_083E3270[])(u16, u16);
+extern const u8 gUnknown_083E039C[];
+extern const u8 gUnknown_083E03A0[];
+extern const u8 gUnknown_083E01F4[];
+extern const u8 *const gTrainerEyeDescriptions[];
+extern const u8 gUnknown_08E9FBA0[];
+extern const u8 gPokenavRibbonView_Gfx[];
+extern const u8 gUnknown_083E040C[];
+extern const u16 gPokenavRibbonView_Pal[];
+extern const u16 gUnknown_083E03A8[];
+extern const u16 gUnknown_083E3C60[][16];
+extern const u16 gPokenavRibbonsIconGfx[][2];
+extern const u8 *const gRibbonDescriptions[][2];
+extern const u8 *const gGiftRibbonDescriptions[][2];
+extern const u8 gUnknown_08E9FF58[];
+extern const u8 gPokenavRibbonPokeView_Gfx[];
+extern const u16 gUnknown_083E0124[];
+extern const u16 gUnknown_083E0144[];
+extern const u8 gPokenavMenuOptions_Gfx[];
+extern const u8 gPokenavConditionMenu_Gfx[];
+extern const u8 gPokenavConditionSearch_Gfx[];
+extern const struct SpriteTemplate gSpriteTemplate_83E4454;
+extern const union AffineAnimCmd *const gSpriteAffineAnimTable_83E4450[];
+extern const u16 gUnknown_083E42F8[];
+extern const u16 gPokenavMenuOptions1_Pal[];
+extern const u16 gPokenavMenuOptions2_Pal[];
+extern const u16 gPokenavConditionMenu_Pal[];
+extern const u16 gPokenavCondition6_Pal[];
+extern const u16 gPokenavCondition7_Pal[];
+extern const struct SpriteSheet gSpriteSheet_PokenavBlueLight;
+extern const struct SpritePalette gSpritePalette_PokenavBlueLight;
+extern const struct SpriteTemplate gSpriteTemplate_83E4484;
+extern const u8 gPokenavMainMenu_Gfx[];
+extern const u8 gPokenavConditionMenuHeader_Gfx[];
+extern const u8 gPokenavRibbonsHeader_Gfx[];
+extern const u8 gPokenavHoennMapHeader_Gfx[];
+extern const u8 gPokenavConditionMenuOptions_Gfx[];
+extern const u8 gPokenavConditionMenuOptions2_Gfx[];
+extern const u8 gPokenavTrainersEyesHeader_Gfx[];
+extern const struct SpritePalette gUnknown_083E449C[];
+extern const struct SpriteTemplate gSpriteTemplate_83E4530;
+extern const struct SpriteTemplate gSpriteTemplate_83E4548;
+extern const struct SpriteTemplate gSpriteTemplate_83E44E0;
+extern const struct SpriteTemplate gSpriteTemplate_83E44F8;
+extern const struct SpriteSheet gUnknown_083E4568;
+extern const struct SpriteTemplate gSpriteTemplate_83E4570;
+extern const struct SpritePalette gUnknown_083E4588;
+extern const struct SpriteSheet gUnknown_083E4590[3];
+extern const struct SpritePalette gUnknown_083E45A8;
+extern const u16 gUnknown_08E9F988[];
+extern const struct SpriteTemplate gSpriteTemplate_83E45B8;
+extern const struct SpriteTemplate gSpriteTemplate_83E45F0;
+extern const struct SpriteSheet gUnknown_083E4628[4];
+extern const struct SpritePalette gUnknown_083E4648[3];
+extern const struct SpriteTemplate gSpriteTemplate_83E4660;
+extern const u16 gUnknown_083E4678[];
+extern const u8 gUnknown_083E3D00[];
+extern const struct SpriteTemplate gSpriteTemplate_83E476C;
+extern const struct SpriteSheet gUnknown_083E4784;
+extern const struct SpritePalette gUnknown_083E478C;
+extern const struct SpriteTemplate gSpriteTemplate_83E4800;
+extern const s16 gUnknown_083E4794[][2];
+extern const u8 gUnknown_083E329C[];
+extern const struct SpritePalette gUnknown_083E4818;
+extern const struct SpriteTemplate gSpriteTemplate_83E4850;
+extern const struct SpritePalette gUnknown_083E4868;
+extern const struct SpriteTemplate gSpriteTemplate_83E4878;
+
+extern u16 gUnknown_020388B4;
+extern u8 gUnknown_020388B0[];
+
 
 // TODO: decompile the debug code so the compiler doesn't complain about
 // unused static functions
@@ -170,131 +252,162 @@ static void sub_80EE58C();
 static void sub_80EE658();
 static void sub_80EE8F4();
 static void sub_80EEDC4();
+static void ShowMapNamePopUpWindow(void);
+static void sub_80F0954(u16, u16, u16);
+static bool8 sub_80F098C(void);
+static u8 *sub_80F445C(u8*, u16);
+static void sub_80F081C(u8);
+bool8 sub_80F0944(void);
+static u8 *sub_80F4428(u8*, u16, u8);
+void sub_80F700C(u8*, u16);
+static void sub_80F0B24(void);
+static bool8 sub_80F0B44(void);
+static void sub_80F0C28(void);
+static bool8 sub_80F0C48(void);
+void LoadTrainerEyesDescriptionLines(void);
+bool8 sub_80F0D5C(void);
+static void sub_80F0EC0(void);
+static bool8 sub_80F0EF4(void);
+static void sub_80F0F64(void);
+static void sub_80F0FA0(void);
+static bool8 sub_80F0FEC(void);
+static bool8 sub_80F0718(void);
+void sub_80F0FFC(u8);
+static void sub_80F19DC(u8*);
+static bool8 sub_80F1080(void);
+void sub_80F1614(void);
+void DrawMonRibbonIcons(void);
+void sub_80F13FC(void);
+void sub_80F1438(void);
+static void sub_80F1494(void);
+bool8 sub_80F162C(u8);
+void sub_80F01E0(u16);
+static void sub_80F19FC(void);
+static void sub_80F1A74(void);
+static void sub_80F1A80(void);
+static void sub_80F1A90(void);
+static bool8 sub_80F1AC4(void);
+static void sub_80F1B8C(u8);
+static bool8 sub_80F1BC8(u8);
+static void sub_80F2458(u8);
+static void sub_80F2514(u8);
+static void sub_80F1DF0(void);
+static void sub_80F2218(struct Sprite *sprite);
+static bool8 sub_80F1E50(void);
+static bool8 sub_80F22F8(void);
+static void sub_80F2108(void);
+static bool8 sub_80F1E6C(void);
+static void sub_80F1E84(void);
+static void sub_80F2148(void);
+static void sub_80F2240(struct Sprite *sprite);
+static bool8 sub_80F1F10(void);
+static bool8 sub_80F2360(void);
+static void sub_80F2170(void);
+static bool8 sub_80F23C8(void);
+static void sub_80F21F8(void);
+static void sub_80F1FF0(void);
+static void sub_80F208C(void);
+static void sub_80F22B0(struct Sprite *sprite);
+static void sub_80F240C(struct Sprite *sprite);
+static void sub_80F2598(void);
+static void sub_80F2620(void);
+static bool8 sub_80F26BC(void);
+static void sub_80F2C58(struct Sprite *sprite);
+static void sub_80F2D04(u8);
+static void sub_80F2D6C(u8);
+static void sub_80F2DD8(void);
+static void sub_80F2DF4(void);
+static void sub_80F2FEC(struct Sprite *sprite);
+static void sub_80F2FB0(void);
+static void sub_80F3008(u8);
+static void sub_80F3130(void);
+static void sub_80F3264(void);
+static void sub_80F3294(u8);
+static void sub_80F35B4(void);
+static void sub_80F363C(struct Sprite *sprite);
+static void SetMonMarkings(u16, u16, u8);
+static void sub_80F36F0(void);
+static bool8 sub_80F3724(void);
+static void sub_80F379C(void);
+static bool8 sub_80F37D0(void);
+static void sub_80F38B8(void);
+static bool8 sub_80F38EC(void);
+static void sub_80F3970(void);
+static bool8 sub_80F39A4(void);
+static void sub_80F3B00(void);
+static bool8 sub_80F3B58(void);
+static void sub_80F3B94(void);
+static bool8 sub_80F3BD4(void);
+static void sub_80F3C2C(void);
+static void sub_80F3F20(u8, u8);
+static void sub_80F3FAC(void);
+static void sub_80F3FF0(void);
+static bool8 sub_80F4024(void);
+static void sub_80F42C4(u8*);
+static void sub_80F4394(void);
+u8 *sub_80F6514(u8*, u16, u8);
+static u8 *sub_80F443C(u8 *, u16);
 
-extern bool8 sub_80F0944(void);
-extern void sub_80F081C();
 extern void sub_80F0900(void);
-extern void sub_80F443C(u8 *, u16);
-extern bool8 sub_80F162C(u8);
-extern void sub_80F01E0(u16);
 extern void sub_80F01A4(void);
-extern void sub_80F1614(void);
 extern void sub_80EFD3C(void);
 extern void sub_8095C8C();
 extern void sub_80EFDA0(void);
 extern void sub_80EFD74(void);
-extern void sub_80F1A80(void);
 extern bool8 sub_80EFC64(void);
 extern void sub_80EFC3C(void);
 extern void sub_80EF624(const u16 *, const u16 *, u8, u8, u16 *);
 extern void sub_80EF7D4(void);
 extern void sub_80EF54C(u8);
-extern void sub_809D104(u16 *, u16, u16, const u8 *, u16, u16, u16, u16);
 extern void sub_80EF58C(u8);
 extern void sub_80F6FFC();
-extern void sub_80F3294();
-extern void sub_80F0B24();
-extern bool8 sub_80F0B44();
-extern void sub_80F0F64();
-extern bool8 sub_80F0FEC();
 extern void sub_80F6FB8();
 extern void sub_80F6DB8();
-extern void sub_80F0CD8();
 extern bool8 sub_80F6E9C();
-extern bool8 sub_80F0D5C();
 extern bool8 sub_80F6ED4();
-extern bool8 sub_80F0EF4();
-extern void sub_80F2FB0();
-extern void sub_80F0FA0();
-extern void sub_80F0C28();
-extern bool8 sub_80F0C48();
 extern bool8 sub_80F70FC();
 extern void sub_80F708C(u32);
-extern void sub_80F4394();
-extern void sub_80F0EC0();
-extern void sub_80F700C();
-extern void sub_80F42C4();
-extern void sub_80F0FFC();
 extern void sub_80F6F10();
-extern void sub_80F3C2C();
-extern void sub_80F15A8();
+static extern void sub_80F15A8(void);
 extern void sub_80F6A4C();
 extern bool8 sub_80F6AF0();
-extern void sub_80F3B00();
-extern bool8 sub_80F3B58();
-extern void sub_80F1494();
 extern u8 sub_80F68E8();
-extern void sub_80F3B94();
-extern bool8 sub_80F3BD4();
 extern void sub_80F66E0();
-extern bool8 sub_80F1080();
-extern void sub_80F38B8();
-extern bool8 sub_80F38EC();
 extern void sub_80F638C();
 extern bool8 sub_80F63D0();
 extern void sub_80F4CF0();
 extern void sub_80EFF34();
 extern bool8 sub_80EFF68();
-extern void sub_80F35B4();
 extern void sub_80F6134();
 extern u8 sub_80F5DD4();
-extern void ShowMapNamePopUpWindow();
-extern bool8 sub_80F0718();
-extern bool8 sub_80F3264();
 extern void sub_80F4D44();
 extern bool8 sub_80F4D88();
 extern void sub_80F0264(u8);
 extern bool8 sub_80F02A0();
-extern void sub_80F3008();
-extern void sub_80F3130();
-extern void sub_80F2D6C(u32);
-extern bool8 sub_80F1E6C();
 extern void sub_80EF9F8(void);
 extern bool8 sub_80EFBDC(bool8);
 extern void sub_80EFBB0(void);
-extern void sub_80F2DF4();
-extern void sub_80F1E84();
-extern bool8 sub_80F1F10();
 extern void sub_80EEFBC(u8);
-extern void sub_80F2620();
 extern void sub_80EF814(void);
 extern void sub_80EF840(void);
 extern bool8 sub_80EF874(void);
-extern void sub_80F2DD8();
 extern bool8 sub_80F6250();
 extern void sub_80F6208();
-extern void sub_80F208C();
 extern void sub_80F6C20();
-extern void sub_80F3FF0();
-extern bool8 sub_80F4024();
-extern void sub_80F2598();
 extern void sub_80EF248(u8);
 extern bool8 sub_80EF284(u8);
-extern void sub_80F1B8C();
-extern bool8 sub_80F1BC8(u32 unk);
-extern void sub_80F1DF0();
-extern bool8 sub_80F1E50();
 extern void sub_80EF428(u8, u8);
 extern bool8 sub_80EEF78();
-extern void sub_80F1A90();
-extern void sub_80F2D04(u32);
-extern bool8 sub_80F1AC4();
-extern void sub_80F36F0();
-extern bool8 sub_80F3724();
 extern void sub_80EBC10();
 extern void sub_80EBDBC(void (*func)(void));
 extern void sub_80EBBE8();
-extern bool8 sub_80F26BC(void);
 extern void sub_80EBDD8();
 extern void sub_80EBD90();
 extern void sub_80EBD18();
-extern void sub_80F1A74();
-extern void sub_80F1FF0();
 extern void sub_80FB260();
 extern void sub_80EFE7C(void);
 extern void sub_80F5BF0();
 extern void sub_80F6F64();
-extern void sub_80F19FC();
 
 extern u16 gKeyRepeatStartDelay;
 
@@ -1194,11 +1307,11 @@ void sub_80ECD80()
 			ewram0_10.var304++;
         break;
     case 9:
-        sub_80F1B8C(0x2);
+        sub_80F1B8C(2);
         ewram0_10.var304++;
         // fall through
     case 10:
-        if (!sub_80F1BC8(0x2))
+        if (!sub_80F1BC8(2))
 			ewram0_10.var304++;
         break;
     case 11:
@@ -3131,7 +3244,7 @@ void sub_80EE658()
         ewram0_10.var304++;
         break;
     case 6:
-        sub_80F0CD8();
+        LoadTrainerEyesDescriptionLines();
         ewram0_10.var304++;
     case 7:
         if (!sub_80F6E9C() && !sub_80F0D5C())
@@ -3662,7 +3775,7 @@ bool8 sub_80EEE54(void)
         sub_80EF58C(2);
         break;
     case 4:
-        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
+        gUnknown_083DFEC4->unk030C = 0;
         REG_BG1HOFS = 0;
         REG_BG1VOFS = 0;
         REG_BG1CNT = 0x1B0C;
@@ -3678,17 +3791,17 @@ bool8 sub_80EEF34(void)
 {
     bool8 retVal = TRUE;
 
-    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32)
+    if (gUnknown_083DFEC4->unk030C == 32)
         return FALSE;
 
-    gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2;
-    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31)
+    gUnknown_083DFEC4->unk030C += 2;
+    if (gUnknown_083DFEC4->unk030C > 31)
     {
-        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32;
+        gUnknown_083DFEC4->unk030C = 32;
         retVal = FALSE;
     }
 
-    REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
+    REG_BG1VOFS = gUnknown_083DFEC4->unk030C;
     return retVal;
 }
 
@@ -3696,17 +3809,17 @@ bool8 sub_80EEF78(void)
 {
     bool8 retVal = TRUE;
 
-    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0)
+    if (gUnknown_083DFEC4->unk030C == 0)
         return FALSE;
 
-    gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2;
-    if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0)
+    gUnknown_083DFEC4->unk030C -= 2;
+    if (gUnknown_083DFEC4->unk030C <= 0)
     {
-        gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0;
+        gUnknown_083DFEC4->unk030C = 0;
         retVal = FALSE;
     }
 
-    REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0;
+    REG_BG1VOFS = gUnknown_083DFEC4->unk030C;
     return retVal;
 }
 
@@ -4484,7 +4597,7 @@ bool8 sub_80EFF68(void)
     {
     case 0:
         sub_80EEDE8();
-        gUnknown_083DFEC4->unkD162[0] = 11;
+        gUnknown_083DFEC4->unkD162 = 11;
         break;
     case 1:
         Text_LoadWindowTemplate(&gWindowTemplate_81E7080);
@@ -4529,7 +4642,7 @@ bool8 sub_80EFF68(void)
         sub_80F01A4();
         break;
     case 12:
-        sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9);
+        sub_80F01E0(gUnknown_083DFEC4->unk8fe9);
         break;
     case 13:
         REG_BG3CNT = 0x1E03;
@@ -4587,7 +4700,6 @@ void sub_80F0264(u8 a)
     }
 }
 
-#ifdef NONMATCHING // small nonmatching part is in the third else clause in case 7.
 bool8 sub_80F02A0(void)
 {
     const u16 *pointer;
@@ -4598,7 +4710,7 @@ bool8 sub_80F02A0(void)
         sub_80EEDE8();
 
         gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1;
-        gUnknown_083DFEC4->unkD162[0] = 11;
+        gUnknown_083DFEC4->unkD162 = 11;
         break;
     case 1:
         Text_LoadWindowTemplate(&gWindowTemplate_81E70D4);
@@ -4647,8 +4759,7 @@ bool8 sub_80F02A0(void)
         else
         {
             LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20);
-            pointer = &gUnknown_08E9F9E8[5];
-            gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5];
+            gPlttBufferUnfaded[0] = *(pointer = &gUnknown_08E9F9E8[5]);
             LoadPalette(gUnknown_083E0314, 0x50, 0x20);
             LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2);
             LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2);
@@ -4690,7 +4801,7 @@ bool8 sub_80F02A0(void)
         else
         {
             sub_80F081C(0);
-            sub_80F0FFC(gUnknown_083DFEC4->unk876E);
+            sub_80F0FFC((u8)gUnknown_083DFEC4->unk876E);
         }
         break;
     case 14:
@@ -4712,414 +4823,3328 @@ bool8 sub_80F02A0(void)
     gUnknown_083DFEC4->unk306++;
     return TRUE;
 }
+
+void sub_80F063C(s16 arg0)
+{
+    s16 var0;
+    s16 var1;
+    s16 var2;
+
+    gUnknown_083DFEC4->unk877C = arg0 * 16;
+    gUnknown_083DFEC4->unk877A = (arg0 == 1 || arg0 == -1) ? 4 : 8;
+    if (arg0 < 0)
+    {
+        gUnknown_083DFEC4->unk877A *= -1;
+        var0 = arg0 * 2 + gUnknown_083DFEC4->unk8778;
+        var1 = arg0 + gUnknown_083DFEC4->unk8770;
+        if (var1 < 0)
+            var1 += gUnknown_083DFEC4->unk8774 + 1;
+
+        arg0 *= -1;
+    }
+    else
+    {
+        var0 = gUnknown_083DFEC4->unk8778 + 16;
+        var1 = gUnknown_083DFEC4->unk8772 + 1;
+    }
+
+    if (var1 > gUnknown_083DFEC4->unk8774)
+        var1 = 0;
+
+    var2 = var0 & 0x1F;
+    sub_80F0954(var1, var2, arg0);
+}
+
+static bool8 sub_80F0718(void)
+{
+    if (!sub_80F098C())
+    {
+        if (gUnknown_083DFEC4->unk877C == 0)
+            return FALSE;
+
+        gUnknown_083DFEC4->unk877C -= gUnknown_083DFEC4->unk877A;
+        gUnknown_083DFEC4->unk8776 += gUnknown_083DFEC4->unk877A;
+        gUnknown_083DFEC4->unk8776 &= 0xFF;
+        REG_BG3VOFS = gUnknown_083DFEC4->unk8776;
+        if (gUnknown_083DFEC4->unk877C == 0)
+        {
+            gUnknown_083DFEC4->unk8778 = ((8 + gUnknown_083DFEC4->unk8776) & 0xFF) / 8;
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+static void ShowMapNamePopUpWindow(void)
+{
+    switch (gUnknown_083DFEC4->unk87CA)
+    {
+    case 0:
+        sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk876E].unk2);
+        break;
+    case 1:
+        sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1);
+        break;
+    default:
+        return;
+    }
+
+    BasicInitMenuWindow(&gWindowTemplate_81E710C);
+    Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 6);
+}
+
+void sub_80F081C(u8 arg0)
+{
+    u32 numTrainerBattles;
+
+    BasicInitMenuWindow(&gWindowTemplate_81E710C);
+    switch (arg0)
+    {
+    case 0:
+    case 1:
+        MenuPrint_RightAligned(gOtherText_NumberRegistered, 10, 9);
+        if (arg0 != 0)
+            break;
+        // fall through
+    case 2:
+        ConvertIntToDecimalStringN(
+            gUnknown_083DFEC4->unk8788,
+            gUnknown_083DFEC4->unk8774 + 1,
+            STR_CONV_MODE_RIGHT_ALIGN,
+            5);
+        MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 11);
+        if (arg0 != 0)
+            break;
+        // fall through
+    case 3:
+        MenuPrint_RightAligned(gOtherText_NumberBattles, 10, 13);
+        if (arg0 != 0)
+            break;
+        // fall through
+    case 4:
+        numTrainerBattles = GetGameStat(GAME_STAT_TRAINER_BATTLES);
+        if (numTrainerBattles > 99999)
+            numTrainerBattles = 99999;
+
+        ConvertIntToDecimalStringN(
+            gUnknown_083DFEC4->unk8788,
+            numTrainerBattles,
+            STR_CONV_MODE_RIGHT_ALIGN,
+            5);
+        MenuPrint_RightAligned(gUnknown_083DFEC4->unk8788, 10, 15);
+        break;
+    }
+}
+
+static void sub_80F08E4(void)
+{
+    BasicInitMenuWindow(&gWindowTemplate_81E710C);
+    Menu_EraseWindowRect(0, 9, 11, 16);
+}
+
+void sub_80F0900(void)
+{
+    s16 var0 = (gUnknown_083DFEC4->unk8772 - gUnknown_083DFEC4->unk8770) + 1;
+    if (var0 < 8)
+        Menu_EraseWindowRect(12, 1, 31, 15);
+
+    sub_80F0954(gUnknown_083DFEC4->unk8770, 0, var0);
+}
+
+bool8 sub_80F0944(void)
+{
+    return sub_80F098C();
+}
+
+static void sub_80F0954(u16 arg0, u16 arg1, u16 arg2)
+{
+    gUnknown_083DFEC4->unk877E = arg0;
+    gUnknown_083DFEC4->unk8780 = arg1;
+    gUnknown_083DFEC4->unk8784 = arg2;
+    gUnknown_083DFEC4->unk8786 = 0;
+}
+
+#ifdef NONMATCHING
+static bool8 sub_80F098C(void)
+{
+    register u16 zero asm("r8");
+    if (!gUnknown_083DFEC4->unk8784)
+    {
+        DONE:
+        return FALSE;
+    }
+
+    zero = 0;
+    gUnknown_083E3270[gUnknown_083DFEC4->unk87CA](gUnknown_083DFEC4->unk877E, gUnknown_083DFEC4->unk8780);
+    if (!--gUnknown_083DFEC4->unk8784)
+        goto DONE;
+
+    if ((++gUnknown_083DFEC4->unk877E & 0xFFFF) > gUnknown_083DFEC4->unk8774)
+        gUnknown_083DFEC4->unk877E = zero;
+
+    gUnknown_083DFEC4->unk8780 += 2;
+    gUnknown_083DFEC4->unk8780 &= 0x1F;
+    return TRUE;
+}
 #else
 NAKED
-bool8 sub_80F02A0(void)
+static bool8 sub_80F098C(void)
 {
     asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    mov r6, r8\n\
-    push {r6}\n\
-    sub sp, 0x18\n\
-    ldr r1, _080F02C4 @ =gUnknown_083DFEC4\n\
-    ldr r0, [r1]\n\
-    ldr r2, _080F02C8 @ =0x00000306\n\
-    adds r0, r2\n\
-    ldrh r0, [r0]\n\
-    adds r2, r1, 0\n\
-    cmp r0, 0xE\n\
-    bls _080F02BA\n\
-    b _080F05FA\n\
-_080F02BA:\n\
-    lsls r0, 2\n\
-    ldr r1, _080F02CC @ =_080F02D0\n\
+    push {r4-r7,lr}\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    ldr r0, _080F09A4 @ =gUnknown_083DFEC4\n\
+    ldr r6, [r0]\n\
+    ldr r0, _080F09A8 @ =0x00008784\n\
+    adds r7, r6, r0\n\
+    ldrh r0, [r7]\n\
+    cmp r0, 0\n\
+    bne _080F09AC\n\
+_080F09A0:\n\
+    movs r0, 0\n\
+    b _080F0A02\n\
+    .align 2, 0\n\
+_080F09A4: .4byte gUnknown_083DFEC4\n\
+_080F09A8: .4byte 0x00008784\n\
+_080F09AC:\n\
+    movs r1, 0\n\
+    mov r8, r1\n\
+    ldr r1, _080F0A0C @ =gUnknown_083E3270\n\
+    ldr r2, _080F0A10 @ =0x000087ca\n\
+    adds r0, r6, r2\n\
+    ldrb r2, [r0]\n\
+    lsls r2, 2\n\
+    adds r2, r1\n\
+    ldr r0, _080F0A14 @ =0x0000877e\n\
+    adds r4, r6, r0\n\
+    ldrh r0, [r4]\n\
+    ldr r1, _080F0A18 @ =0x00008780\n\
+    adds r5, r6, r1\n\
+    ldrh r1, [r5]\n\
+    ldr r2, [r2]\n\
+    bl _call_via_r2\n\
+    ldrh r0, [r7]\n\
+    subs r0, 0x1\n\
+    strh r0, [r7]\n\
+    ldr r2, _080F0A1C @ =0x0000ffff\n\
+    adds r1, r2, 0\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    beq _080F09A0\n\
+    ldrh r0, [r4]\n\
+    adds r0, 0x1\n\
+    strh r0, [r4]\n\
+    ands r0, r1\n\
+    ldr r2, _080F0A20 @ =0x00008774\n\
+    adds r1, r6, r2\n\
+    movs r2, 0\n\
+    ldrsh r1, [r1, r2]\n\
+    cmp r0, r1\n\
+    ble _080F09F6\n\
+    mov r0, r8\n\
+    strh r0, [r4]\n\
+_080F09F6:\n\
+    ldrh r0, [r5]\n\
+    adds r0, 0x2\n\
+    movs r1, 0x1F\n\
+    ands r0, r1\n\
+    strh r0, [r5]\n\
+    movs r0, 0x1\n\
+_080F0A02:\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
+_080F0A0C: .4byte gUnknown_083E3270\n\
+_080F0A10: .4byte 0x000087ca\n\
+_080F0A14: .4byte 0x0000877e\n\
+_080F0A18: .4byte 0x00008780\n\
+_080F0A1C: .4byte 0x0000ffff\n\
+_080F0A20: .4byte 0x00008774\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+void sub_80F0A24(u16 arg0, u16 arg1)
+{
+    u8 var0 = gUnknown_083DFEC4->unk87C8 == 0 ? 2 : 1;
+    sub_80F4428(gUnknown_083DFEC4->unk8788, arg0, var0);
+    BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+    Menu_PrintText(gUnknown_083DFEC4->unk8788, 13, arg1);
+}
+
+static void sub_80F0A74(u16 arg0, u16 arg1)
+{
+    sub_80F700C(gUnknown_083DFEC4->unk8788, arg0);
+    arg1 &= 0x1F;
+    BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+    Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, arg1 * 8, 0);
+    if (arg0 < gUnknown_083DFEC4->unkD158 && gUnknown_083DFEC4->unkCEE8[arg0].unk5)
+        sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E039C, 0, 0, 1, 2, 1);
+    else
+        sub_8095C8C((void *)VRAM + 0xF000, 29, arg1, gUnknown_083E03A0, 0, 0, 1, 2, 1);
+}
+
+static void sub_80F0B24(void)
+{
+    gUnknown_083DFEC4->unkD15C = 0;
+    gUnknown_083DFEC4->unk306 = 0;
+}
+
+static bool8 sub_80F0B44(void)
+{
+    int top;
+    if (gUnknown_083DFEC4->unkD15C > 8)
+    {
+        return FALSE;
+    }
+
+    if (++gUnknown_083DFEC4->unk306 > 1)
+    {
+        gUnknown_083DFEC4->unk306 = 0;
+        if (gUnknown_083DFEC4->unkD15C < 8)
+        {
+            top = (gUnknown_083DFEC4->unk8778 + (gUnknown_083DFEC4->unkD15C * 2)) & 0x1F;
+            if (gUnknown_083DFEC4->unkD15C != gUnknown_083DFEC4->unk876C)
+            {
+                BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+                Menu_EraseWindowRect(12, top, 31, top + 1);
+            }
+
+            if (!gUnknown_083DFEC4->unkD15C)
+                sub_80F08E4();
+
+            gUnknown_083DFEC4->unkD15C++;
+            return TRUE;
+        }
+        else
+        {
+            u16 i;
+            BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+            top = (gUnknown_083DFEC4->unk8778 + 16) & 0x1F;
+            for (i = 0; i < 8; i++)
+            {
+                Menu_EraseWindowRect(12, top, 31, top + 1);
+                top = (top + 2) & 0x1F;
+            }
+
+            gUnknown_083DFEC4->unkD15C++;
+            return FALSE;
+        }
+    }
+    else
+    {
+        return TRUE;
+    }
+}
+
+static void sub_80F0C28(void)
+{
+    gUnknown_083DFEC4->unkD15C = 0;
+    gUnknown_083DFEC4->unk306 = 0;
+}
+
+static bool8 sub_80F0C48(void)
+{
+    if (gUnknown_083DFEC4->unkD15C > 7)
+        return FALSE;
+
+    if (++gUnknown_083DFEC4->unk306 > 1)
+    {
+        gUnknown_083DFEC4->unk306 = 0;
+        BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+        sub_80F0A74(gUnknown_083DFEC4->unk8770 + gUnknown_083DFEC4->unkD15C,
+                    gUnknown_083DFEC4->unk8778 + gUnknown_083DFEC4->unkD15C * 2);
+
+        if ((++gUnknown_083DFEC4->unkD15C) > 7)
+        {
+            sub_80F081C(0);
+            return FALSE;
+        }
+    }
+    
+    return TRUE;
+}
+
+void LoadTrainerEyesDescriptionLines(void)
+{
+    u16 i;
+    int trainerEyesId;
+    const u8 *curChar;
+
+    gUnknown_083DFEC4->unk306 = 0;
+    gUnknown_083DFEC4->unkD15C = 0;
+    trainerEyesId = gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unk876E].unk4;
+    gUnknown_083DFEC4->trainerEyeDescriptionLines[0] = gTrainerEyeDescriptions[trainerEyesId];
+
+    // Find the start of the 3 other lines in the Trainer's Eyes description.
+    curChar = gUnknown_083DFEC4->trainerEyeDescriptionLines[0];
+    for (i = 0; i < 3; i++)
+    {
+        while (*curChar != EOS)
+            curChar++;
+        gUnknown_083DFEC4->trainerEyeDescriptionLines[i + 1] = ++curChar;
+    }
+}
+
+#ifdef NONMATCHING
+// small register mismatch (r2/r3) on the line where var0 is set.
+bool8 sub_80F0D5C(void)
+{
+    int var0;
+    if (gUnknown_083DFEC4->unkD15C == 7)
+        return FALSE;
+
+    if (++gUnknown_083DFEC4->unk306 > 1)
+    {
+        gUnknown_083DFEC4->unk306 = 0;
+        BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+        var0 = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F;
+        switch (gUnknown_083DFEC4->unkD15C)
+        {
+        case 0:
+            Menu_PrintTextPixelCoords(gOtherText_Strategy, 97, var0 * 8, 0);
+            break;
+        case 1:
+            AlignStringInMenuWindow(
+                gUnknown_083DFEC4->unk8788,
+                gUnknown_083DFEC4->trainerEyeDescriptionLines[0],
+                136,
+                0);
+            Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0);
+            break;
+        case 2:
+            Menu_PrintTextPixelCoords(gOtherText_TrainersPokemon, 97, var0 * 8, 0);
+            break;
+        case 3:
+            AlignStringInMenuWindow(
+                gUnknown_083DFEC4->unk8788,
+                gUnknown_083DFEC4->trainerEyeDescriptionLines[1],
+                136,
+                0);
+            Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0);
+            break;
+        case 4:
+            Menu_PrintTextPixelCoords(gOtherText_SelfIntroduction, 97, var0 * 8, 0);
+            break;
+        case 5:
+            AlignStringInMenuWindow(
+                gUnknown_083DFEC4->unk8788,
+                gUnknown_083DFEC4->trainerEyeDescriptionLines[2],
+                136,
+                0);
+            Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0);
+            break;
+        case 6:
+            AlignStringInMenuWindow(
+                gUnknown_083DFEC4->unk8788,
+                gUnknown_083DFEC4->trainerEyeDescriptionLines[3],
+                136,
+                0);
+            Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 97, var0 * 8, 0);
+        default:
+            return FALSE;
+        }
+
+        gUnknown_083DFEC4->unkD15C++;
+        return TRUE;
+    }
+    else
+    {
+        return TRUE;
+    }
+}
+#else
+NAKED
+bool8 sub_80F0D5C(void)
+{
+    asm(".syntax unified\n\
+    push {r4,r5,lr}\n\
+    ldr r0, _080F0D70 @ =gUnknown_083DFEC4\n\
+    ldr r4, [r0]\n\
+    ldr r0, _080F0D74 @ =0x0000d15c\n\
+    adds r5, r4, r0\n\
+    ldrh r0, [r5]\n\
+    cmp r0, 0x7\n\
+    bne _080F0D78\n\
+_080F0D6C:\n\
+    movs r0, 0\n\
+    b _080F0EB0\n\
+    .align 2, 0\n\
+_080F0D70: .4byte gUnknown_083DFEC4\n\
+_080F0D74: .4byte 0x0000d15c\n\
+_080F0D78:\n\
+    ldr r0, _080F0DB8 @ =0x00000306\n\
+    adds r1, r4, r0\n\
+    ldrh r0, [r1]\n\
+    adds r0, 0x1\n\
+    strh r0, [r1]\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x1\n\
+    bhi _080F0D8C\n\
+    b _080F0EAE\n\
+_080F0D8C:\n\
+    movs r0, 0\n\
+    strh r0, [r1]\n\
+    ldr r0, _080F0DBC @ =gWindowTemplate_81E70D4\n\
+    bl BasicInitMenuWindow\n\
+    ldr r0, _080F0DC0 @ =0x00008778\n\
+    adds r1, r4, r0\n\
+    ldrh r3, [r5]\n\
+    lsls r0, r3, 1\n\
+    adds r0, 0x2\n\
+    ldrh r1, [r1]\n\
+    adds r5, r0, r1\n\
+    movs r0, 0x1F\n\
+    ands r5, r0\n\
+    cmp r3, 0x6\n\
+    bhi _080F0D6C\n\
+    lsls r0, r3, 2\n\
+    ldr r1, _080F0DC4 @ =_080F0DC8\n\
     adds r0, r1\n\
     ldr r0, [r0]\n\
     mov pc, r0\n\
     .align 2, 0\n\
-_080F02C4: .4byte gUnknown_083DFEC4\n\
-_080F02C8: .4byte 0x00000306\n\
-_080F02CC: .4byte _080F02D0\n\
+_080F0DB8: .4byte 0x00000306\n\
+_080F0DBC: .4byte gWindowTemplate_81E70D4\n\
+_080F0DC0: .4byte 0x00008778\n\
+_080F0DC4: .4byte _080F0DC8\n\
     .align 2, 0\n\
-_080F02D0:\n\
-    .4byte _080F030C\n\
-    .4byte _080F0344\n\
-    .4byte _080F0350\n\
-    .4byte _080F035C\n\
-    .4byte _080F0368\n\
-    .4byte _080F036E\n\
-    .4byte _080F0380\n\
-    .4byte _080F0394\n\
-    .4byte _080F04BC\n\
-    .4byte _080F053C\n\
-    .4byte _080F0550\n\
-    .4byte _080F0574\n\
-    .4byte _080F057A\n\
-    .4byte _080F0586\n\
-    .4byte _080F05BC\n\
-_080F030C:\n\
-    bl sub_80EEDE8\n\
-    ldr r0, _080F0334 @ =gUnknown_083DFEC4\n\
-    ldr r1, [r0]\n\
-    movs r2, 0\n\
-    ldr r3, _080F0338 @ =0x000087ca\n\
-    adds r0, r1, r3\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0x1\n\
-    bne _080F0322\n\
-    movs r2, 0x1\n\
-_080F0322:\n\
-    ldr r3, _080F033C @ =0x000087c8\n\
-    adds r0, r1, r3\n\
-    strb r2, [r0]\n\
-    ldr r0, _080F0340 @ =0x0000d162\n\
-    adds r1, r0\n\
-    movs r0, 0xB\n\
-    strb r0, [r1]\n\
-    b _080F0618\n\
+_080F0DC8:\n\
+    .4byte _080F0DE4\n\
+    .4byte _080F0DF0\n\
+    .4byte _080F0E08\n\
+    .4byte _080F0E14\n\
+    .4byte _080F0E2C\n\
+    .4byte _080F0E38\n\
+    .4byte _080F0E6C\n\
+_080F0DE4:\n\
+    ldr r0, _080F0DEC @ =gOtherText_Strategy\n\
+    lsls r2, r5, 3\n\
+    b _080F0E54\n\
     .align 2, 0\n\
-_080F0334: .4byte gUnknown_083DFEC4\n\
-_080F0338: .4byte 0x000087ca\n\
-_080F033C: .4byte 0x000087c8\n\
-_080F0340: .4byte 0x0000d162\n\
-_080F0344:\n\
-    ldr r0, _080F034C @ =gWindowTemplate_81E70D4\n\
-    bl Text_LoadWindowTemplate\n\
-    b _080F0618\n\
+_080F0DEC: .4byte gOtherText_Strategy\n\
+_080F0DF0:\n\
+    ldr r0, _080F0DFC @ =gUnknown_083DFEC4\n\
+    ldr r0, [r0]\n\
+    ldr r1, _080F0E00 @ =0x00008788\n\
+    adds r4, r0, r1\n\
+    ldr r1, _080F0E04 @ =0x0000d110\n\
+    b _080F0E42\n\
     .align 2, 0\n\
-_080F034C: .4byte gWindowTemplate_81E70D4\n\
-_080F0350:\n\
-    ldr r0, _080F0358 @ =gWindowTemplate_81E70D4\n\
-    bl MultistepInitMenuWindowBegin\n\
-    b _080F0618\n\
+_080F0DFC: .4byte gUnknown_083DFEC4\n\
+_080F0E00: .4byte 0x00008788\n\
+_080F0E04: .4byte 0x0000d110\n\
+_080F0E08:\n\
+    ldr r0, _080F0E10 @ =gOtherText_TrainersPokemon\n\
+    lsls r2, r5, 3\n\
+    b _080F0E54\n\
     .align 2, 0\n\
-_080F0358: .4byte gWindowTemplate_81E70D4\n\
-_080F035C:\n\
-    bl MultistepInitMenuWindowContinue\n\
-    cmp r0, 0\n\
-    beq _080F0366\n\
-    b _080F0618\n\
-_080F0366:\n\
-    b _080F0626\n\
-_080F0368:\n\
-    bl Menu_EraseScreen\n\
-    b _080F0618\n\
-_080F036E:\n\
-    ldr r0, _080F0378 @ =gUnknown_08E9FC64\n\
-    ldr r1, _080F037C @ =0x0600e800\n\
-    bl LZ77UnCompVram\n\
-    b _080F0618\n\
+_080F0E10: .4byte gOtherText_TrainersPokemon\n\
+_080F0E14:\n\
+    ldr r0, _080F0E20 @ =gUnknown_083DFEC4\n\
+    ldr r0, [r0]\n\
+    ldr r1, _080F0E24 @ =0x00008788\n\
+    adds r4, r0, r1\n\
+    ldr r1, _080F0E28 @ =0x0000d114\n\
+    b _080F0E42\n\
     .align 2, 0\n\
-_080F0378: .4byte gUnknown_08E9FC64\n\
-_080F037C: .4byte 0x0600e800\n\
-_080F0380:\n\
-    ldr r0, _080F038C @ =gPokenavConditionSearch2_Gfx\n\
-    ldr r1, _080F0390 @ =0x06008000\n\
-    bl LZ77UnCompVram\n\
-    b _080F0618\n\
+_080F0E20: .4byte gUnknown_083DFEC4\n\
+_080F0E24: .4byte 0x00008788\n\
+_080F0E28: .4byte 0x0000d114\n\
+_080F0E2C:\n\
+    ldr r0, _080F0E34 @ =gOtherText_SelfIntroduction\n\
+    lsls r2, r5, 3\n\
+    b _080F0E54\n\
     .align 2, 0\n\
-_080F038C: .4byte gPokenavConditionSearch2_Gfx\n\
-_080F0390: .4byte 0x06008000\n\
-_080F0394:\n\
-    ldr r6, _080F03FC @ =gUnknown_083E02B4\n\
-    adds r0, r6, 0\n\
-    movs r1, 0xB0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0\n\
-    movs r1, 0xF0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r0, _080F0400 @ =gUnknown_083E0334\n\
-    movs r1, 0x40\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r0, _080F0404 @ =gUnknown_083DFEC4\n\
+_080F0E34: .4byte gOtherText_SelfIntroduction\n\
+_080F0E38:\n\
+    ldr r0, _080F0E60 @ =gUnknown_083DFEC4\n\
     ldr r0, [r0]\n\
-    ldr r1, _080F0408 @ =0x000087ca\n\
+    ldr r1, _080F0E64 @ =0x00008788\n\
+    adds r4, r0, r1\n\
+    ldr r1, _080F0E68 @ =0x0000d118\n\
+_080F0E42:\n\
     adds r0, r1\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0\n\
-    bne _080F0418\n\
-    ldr r4, _080F040C @ =gPokenavConditionSearch2_Pal\n\
+    ldr r1, [r0]\n\
     adds r0, r4, 0\n\
-    movs r1, 0x30\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r1, _080F0410 @ =gPlttBufferUnfaded\n\
-    ldrh r0, [r4, 0xA]\n\
-    strh r0, [r1]\n\
-    ldr r0, _080F0414 @ =gUnknownPalette_81E6692\n\
-    movs r1, 0xB0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0x2\n\
-    movs r1, 0xB1\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0\n\
-    adds r0, 0x10\n\
-    movs r1, 0xB5\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r4, 0xA\n\
+    movs r2, 0x88\n\
+    movs r3, 0\n\
+    bl AlignStringInMenuWindow\n\
+    lsls r2, r5, 3\n\
     adds r0, r4, 0\n\
-    movs r1, 0xBF\n\
-    b _080F04A8\n\
+_080F0E54:\n\
+    movs r1, 0x61\n\
+    movs r3, 0\n\
+    bl Menu_PrintTextPixelCoords\n\
+    b _080F0EA0\n\
     .align 2, 0\n\
-_080F03FC: .4byte gUnknown_083E02B4\n\
-_080F0400: .4byte gUnknown_083E0334\n\
-_080F0404: .4byte gUnknown_083DFEC4\n\
-_080F0408: .4byte 0x000087ca\n\
-_080F040C: .4byte gPokenavConditionSearch2_Pal\n\
-_080F0410: .4byte gPlttBufferUnfaded\n\
-_080F0414: .4byte gUnknownPalette_81E6692\n\
-_080F0418:\n\
-    cmp r0, 0x1\n\
-    bne _080F0464\n\
-    ldr r4, _080F0458 @ =gUnknown_083E0274\n\
+_080F0E60: .4byte gUnknown_083DFEC4\n\
+_080F0E64: .4byte 0x00008788\n\
+_080F0E68: .4byte 0x0000d118\n\
+_080F0E6C:\n\
+    ldr r0, _080F0E94 @ =gUnknown_083DFEC4\n\
+    ldr r0, [r0]\n\
+    ldr r1, _080F0E98 @ =0x00008788\n\
+    adds r4, r0, r1\n\
+    ldr r1, _080F0E9C @ =0x0000d11c\n\
+    adds r0, r1\n\
+    ldr r1, [r0]\n\
     adds r0, r4, 0\n\
-    movs r1, 0x30\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r1, _080F045C @ =gPlttBufferUnfaded\n\
-    ldrh r0, [r4, 0xA]\n\
-    strh r0, [r1]\n\
-    ldr r0, _080F0460 @ =gUnknownPalette_81E6692\n\
-    movs r1, 0xB0\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0x2\n\
-    movs r1, 0xB1\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0\n\
-    adds r0, 0x10\n\
-    movs r1, 0xB5\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r4, 0xA\n\
+    movs r2, 0x88\n\
+    movs r3, 0\n\
+    bl AlignStringInMenuWindow\n\
+    lsls r2, r5, 3\n\
     adds r0, r4, 0\n\
-    movs r1, 0xBF\n\
-    b _080F04A8\n\
+    movs r1, 0x61\n\
+    movs r3, 0\n\
+    bl Menu_PrintTextPixelCoords\n\
+    b _080F0D6C\n\
     .align 2, 0\n\
-_080F0458: .4byte gUnknown_083E0274\n\
-_080F045C: .4byte gPlttBufferUnfaded\n\
-_080F0460: .4byte gUnknownPalette_81E6692\n\
-_080F0464:\n\
-    ldr r4, _080F04B0 @ =gUnknown_08E9F9E8\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x30\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    ldr r1, _080F04B4 @ =gPlttBufferUnfaded\n\
-    adds r5, r4, 0\n\
-    adds r5, 0xA\n\
-    ldrh r0, [r4, 0xA]\n\
+_080F0E94: .4byte gUnknown_083DFEC4\n\
+_080F0E98: .4byte 0x00008788\n\
+_080F0E9C: .4byte 0x0000d11c\n\
+_080F0EA0:\n\
+    ldr r0, _080F0EB8 @ =gUnknown_083DFEC4\n\
+    ldr r1, [r0]\n\
+    ldr r0, _080F0EBC @ =0x0000d15c\n\
+    adds r1, r0\n\
+    ldrh r0, [r1]\n\
+    adds r0, 0x1\n\
     strh r0, [r1]\n\
-    ldr r0, _080F04B8 @ =gUnknown_083E0314\n\
-    movs r1, 0x50\n\
-    movs r2, 0x20\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0x2\n\
-    movs r1, 0xB1\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r0, r6, 0\n\
-    adds r0, 0x10\n\
-    movs r1, 0xB5\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r0, r5, 0\n\
-    movs r1, 0xBF\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    adds r0, r5, 0\n\
-    movs r1, 0x5F\n\
-_080F04A8:\n\
-    movs r2, 0x2\n\
-    bl LoadPalette\n\
-    b _080F0618\n\
-    .align 2, 0\n\
-_080F04B0: .4byte gUnknown_08E9F9E8\n\
-_080F04B4: .4byte gPlttBufferUnfaded\n\
-_080F04B8: .4byte gUnknown_083E0314\n\
-_080F04BC:\n\
-    ldr r0, _080F04E8 @ =gUnknown_083DFEC4\n\
-    ldr r0, [r0]\n\
-    ldr r2, _080F04EC @ =0x000087ca\n\
-    adds r0, r2\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0x2\n\
-    beq _080F04F8\n\
-    ldr r0, _080F04F0 @ =0x0600e800\n\
-    ldr r3, _080F04F4 @ =gUnknown_08E9FD1C\n\
-    movs r1, 0\n\
-    str r1, [sp]\n\
-    str r1, [sp, 0x4]\n\
-    movs r2, 0x9\n\
-    str r2, [sp, 0x8]\n\
-    movs r1, 0x4\n\
-    str r1, [sp, 0xC]\n\
-    str r2, [sp, 0x10]\n\
-    movs r1, 0\n\
-    movs r2, 0x5\n\
-    bl sub_8095C8C\n\
-    b _080F0618\n\
+_080F0EAE:\n\
+    movs r0, 0x1\n\
+_080F0EB0:\n\
+    pop {r4,r5}\n\
+    pop {r1}\n\
+    bx r1\n\
     .align 2, 0\n\
-_080F04E8: .4byte gUnknown_083DFEC4\n\
-_080F04EC: .4byte 0x000087ca\n\
-_080F04F0: .4byte 0x0600e800\n\
-_080F04F4: .4byte gUnknown_08E9FD1C\n\
-_080F04F8:\n\
-    ldr r3, _080F0530 @ =0x0600e800\n\
-    mov r8, r3\n\
-    ldr r3, _080F0534 @ =gUnknown_08E9FE54\n\
-    movs r4, 0\n\
-    str r4, [sp]\n\
-    str r4, [sp, 0x4]\n\
-    movs r5, 0xC\n\
-    str r5, [sp, 0x8]\n\
-    movs r6, 0xA\n\
-    str r6, [sp, 0xC]\n\
-    str r5, [sp, 0x10]\n\
-    mov r0, r8\n\
-    movs r1, 0\n\
-    movs r2, 0x4\n\
-    bl sub_8095C8C\n\
-    ldr r3, _080F0538 @ =gUnknown_08E9FD64\n\
-    str r4, [sp]\n\
-    str r4, [sp, 0x4]\n\
-    str r5, [sp, 0x8]\n\
-    str r6, [sp, 0xC]\n\
-    str r5, [sp, 0x10]\n\
-    mov r0, r8\n\
-    movs r1, 0\n\
-    movs r2, 0x8\n\
-    bl sub_8095C8C\n\
-    b _080F0618\n\
+_080F0EB8: .4byte gUnknown_083DFEC4\n\
+_080F0EBC: .4byte 0x0000d15c\n\
+    .syntax divided\n");
+}
+#endif
+
+static void sub_80F0EC0(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    gUnknown_083DFEC4->unkD15C = 0;
+    StringFill(gUnknown_083DFEC4->unk8788, CHAR_SPACE, 16);
+}
+
+static bool8 sub_80F0EF4(void)
+{
+    int top;
+    if (gUnknown_083DFEC4->unkD15C > 6)
+        return FALSE;
+
+    if (++gUnknown_083DFEC4->unk306 > 1)
+    {
+        gUnknown_083DFEC4->unk306 = 0;
+        top = (gUnknown_083DFEC4->unk8778 + 2 + gUnknown_083DFEC4->unkD15C * 2) & 0x1F;
+        BasicInitMenuWindow(&gWindowTemplate_81E70D4);
+        Menu_EraseWindowRect(12, top, 31, top + 1);
+        gUnknown_083DFEC4->unkD15C++;
+    }
+
+    return TRUE;
+}
+
+static void sub_80F0F64(void)
+{
+    s16 var0 = gUnknown_083DFEC4->unk876C;
+    gUnknown_083DFEC4->unk877C = var0 * 16;
+    gUnknown_083DFEC4->unk877A = var0 == 1 ? 4 : 8;
+}
+
+static void sub_80F0FA0(void)
+{
+    s16 var0 = gUnknown_083DFEC4->unk876C * -1;
+    gUnknown_083DFEC4->unk877C = var0 * 16;
+    gUnknown_083DFEC4->unk877A = var0 == -1 ? -4 : -8;
+}
+
+static bool8 sub_80F0FEC(void)
+{
+    return sub_80F0718();
+}
+
+void sub_80F0FFC(u8 arg0)
+{
+    GetMapSectionName(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unkCEE8[arg0].unk2, 0);
+    BasicInitMenuWindow(&gWindowTemplate_81E710C);
+    sub_80F19DC(gUnknown_083DFEC4->unk8788);
+    AlignStringInMenuWindow(gUnknown_083DFEC4->unkD138, gUnknown_083DFEC4->unk8788, 88, 2);
+    Menu_PrintText(gUnknown_083DFEC4->unkD138, 0, 5);
+}
+
+void sub_80F105C(void)
+{
+    sub_80F0A74(gUnknown_083DFEC4->unk876E, gUnknown_083DFEC4->unk8778);
+}
+
+static bool8 sub_80F1080(void)
+{
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        sub_80EEDE8();
+        gUnknown_083DFEC4->unkD162 = 11;
+        break;
+    case 1:
+        Text_LoadWindowTemplate(&gWindowTemplate_81E70B8);
+        break;
+    case 2:
+        MultistepInitMenuWindowBegin(&gWindowTemplate_81E70B8);
+        break;
+    case 3:
+        if (!MultistepInitMenuWindowContinue())
+            return TRUE;
+        break;
+    case 4:
+        Menu_EraseScreen();
+        break;
+    case 5:
+        sub_80F1614();
+        break;
+    case 6:
+        if (sub_80F162C(1))
+            return TRUE;
+        break;
+    case 7:
+        LZ77UnCompWram(gUnknown_08E9FBA0, gUnknown_083DFEC4->unk934C);
+        break;
+    case 8:
+        DrawMonRibbonIcons();
+        break;
+    case 9:
+        sub_80F13FC();
+        break;
+    case 10:
+        LZ77UnCompVram(gPokenavRibbonView_Gfx, (void *)(VRAM + 0x8000));
+        break;
+    case 11:
+        LZ77UnCompVram(gUnknown_083E040C, (void *)(VRAM + 0x8200));
+        break;
+    case 12:
+        LoadPalette(gPokenavRibbonView_Pal, 0x20, 0x20);
+        LoadPalette(gUnknown_083E03A8, 0xF0, 0x20);
+        LoadPalette(gUnknown_083E3C60[0], 0x30, 0xA0);
+        LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
+        LoadPalette(gUnknown_083E03A8 + 0xF, 0xBF, 0x2);
+        break;
+    case 13:
+        sub_80F1438();
+        break;
+    case 14:
+        REG_BG2CNT = 0x1E02;
+        REG_BG3CNT = 0x170B;
+        REG_BLDCNT = 0;
+        gUnknown_083DFEC4->unkD160++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
+}
+
+void DrawMonRibbonIcons(void)
+{
+    u16 i;
+    u16 offset;
+    u8 index, palette, tile;
+    u8 var0;
+    
+    offset = 0x8B;
+    var0 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F;
+
+    for (i = 0; i < 8; i++)
+        CpuFill16(0x2000, &gUnknown_083DFEC4->unk934C[offset + i * 32], 0x24);
+
+    for (i = 0; i < var0; i++)
+    {
+        index = gUnknown_083DFEC4->unkBC4C[i];
+        palette = gPokenavRibbonsIconGfx[index][1] + 3;
+        tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10;
+        gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile;
+        gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile;
+        gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1);
+        gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1);
+
+        if ((i + 1) % 9 == 0)
+            offset += 0x30;
+        else
+            offset += 2;
+    }
+
+    offset = 0x14B;
+    for (i = 0; i < gUnknown_083DFEC4->unkBC8F; i++)
+    {
+        index = gUnknown_083DFEC4->unkBC4C[var0 + i];
+        palette = gPokenavRibbonsIconGfx[index][1] + 3;
+        tile = gPokenavRibbonsIconGfx[index][0] * 2 + 0x10;
+        gUnknown_083DFEC4->unk934C[offset] = (palette << 12) | tile;
+        gUnknown_083DFEC4->unk934C[offset + 1] = ((palette << 12) | 0x400) | tile;
+        gUnknown_083DFEC4->unk934C[offset + 0x20] = (palette << 12) | (tile + 1);
+        gUnknown_083DFEC4->unk934C[offset + 0x21] = (palette << 12) | 0x400 | (tile + 1);
+
+        offset += 2;
+    }
+}
+
+void sub_80F13FC(void)
+{
+    u16 *src = gUnknown_083DFEC4->unk934C;
+    u16 *dest = (u16 *)(VRAM + 0xB800);
+    DmaCopy32(3, src, dest, 0x500);
+    gPlttBufferUnfaded[0] = *(gPokenavRibbonView_Pal + 14);
+}
+
+void sub_80F1438(void)
+{
+    Menu_PrintText(gUnknown_083DFEC4->unk8829[0], 13, 1);
+    sub_80F445C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk876E + 1);
+    Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 5);
+}
+
+void sub_80F1480(void)
+{
+    Menu_EraseWindowRect(12, 13, 27, 16);
+}
+
+// This is a fakematching function, due to a hardcoded access of gSaveBlock1.
+// Due to this hardcoded address access, gift ribbons do not properly display
+// their descriptions, since the hardcoded access is inside of the LinkBattleRecords
+// save data, rather than the giftRibbons array, which is almost certainly what the
+// intended access is.
+static void sub_80F1494(void)
+{
+    u8 *arr;
+    u8 *tileBuffer1 = &gUnknown_083DFEC8[0x800];
+    u8 *tileBuffer2 = &gUnknown_083DFEC8[0xA98];
+
+    if (gUnknown_083DFEC4->unkBC91 < 3)
+    {
+        gUnknown_020388B4 = gUnknown_083DFEC4->unkBC91 * 9 + gUnknown_083DFEC4->unkBC90;
+        gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4];
+        AlignStringInMenuWindow(tileBuffer1, gRibbonDescriptions[gUnknown_020388B4][0], 128, 0);
+        AlignStringInMenuWindow(tileBuffer2, gRibbonDescriptions[gUnknown_020388B4][1], 128, 0);
+    }
+    else
+    {
+        gUnknown_020388B4 = gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F;
+        gUnknown_020388B4 = gUnknown_083DFEC4->unkBC4C[gUnknown_020388B4 + gUnknown_083DFEC4->unkBC90];
+
+        // FIXME!
+        arr = ((u8*)&gSaveBlock1);
+        asm("ldrh r1, [r5]\n\
+            add r0, r0, r1");
+        gUnknown_020388B4 = arr[0x30F7];
+        // The bug fix for this code is the following:
+        // gUnknown_020388B4 = gSaveBlock1.externalReservedData.giftRibbons[gUnknown_020388B4];
+        if (gUnknown_020388B4)
+        {
+            gUnknown_020388B4--;
+            AlignStringInMenuWindow(tileBuffer1, gGiftRibbonDescriptions[gUnknown_020388B4][0], 128, 0);
+            AlignStringInMenuWindow(tileBuffer2, gGiftRibbonDescriptions[gUnknown_020388B4][1], 128, 0);
+        }
+        else
+        {
+            AlignStringInMenuWindow(tileBuffer1, gEmptyString_81E72B0, 128, 0);
+            AlignStringInMenuWindow(tileBuffer2, gEmptyString_81E72B0, 128, 0);
+        }
+    }
+
+    Menu_PrintText(tileBuffer1, 12, 13);
+    Menu_PrintText(tileBuffer2, 12, 15);
+}
+
+static void sub_80F15A8(void)
+{
+    u8 *buffer;
+    Menu_EraseWindowRect(12, 13, 27, 16);
+    buffer = StringCopy(gUnknown_083DFEC4->unk8788, gOtherText_Ribbons);
+    buffer[0] = CHAR_SPACE;
+    buffer++;
+    buffer = ConvertIntToDecimalStringN(
+            buffer,
+            gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk0,
+            STR_CONV_MODE_LEFT_ALIGN,
+            2);
+    buffer[0] = EOS;
+    Menu_PrintText(gUnknown_083DFEC4->unk8788, 12, 13);
+}
+
+void sub_80F1614(void)
+{
+    gUnknown_083DFEC4->unk8764 = 0;
+}
+
+bool8 sub_80F162C(u8 arg0)
+{
+    switch (gUnknown_083DFEC4->unk8764)
+    {
+    case 0:
+        break;
+    case 1:
+        LZ77UnCompVram(gUnknown_08E9FF58, (void *)(VRAM + 0xE800));
+        break;
+    case 2:
+        DmaCopy16Defvars(3, gPokenavRibbonPokeView_Gfx, (void *)(VRAM + 0xE000), 0xE0);
+        break;
+    case 3:
+        if (!arg0)
+            LoadPalette(gUnknown_083E0124, 0xD0, 0x20);
+        else
+            LoadPalette(gUnknown_083E0144, 0xD0, 0x20);
+
+        gUnknown_083DFEC4->unk8766 = -80;
+        REG_BG0CNT = 0x1D0D;
+        gUnknown_083DFEC4->unk8764++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk8764++;
+    return TRUE;
+}
+
+bool8 sub_80F170C(void)
+{
+    gUnknown_083DFEC4->unk8766 += 0x10;
+    if (gUnknown_083DFEC4->unk8766 > 0)
+        gUnknown_083DFEC4->unk8766 = 0;
+
+    return gUnknown_083DFEC4->unk8766 != 0;
+}
+
+bool8 sub_80F173C(void)
+{
+    gUnknown_083DFEC4->unk8766 -= 0x10;
+    if (gUnknown_083DFEC4->unk8766 < -0x50)
+        gUnknown_083DFEC4->unk8766 = -0x50;
+
+    return gUnknown_083DFEC4->unk8766 != -0x50;
+}
+
+bool8 sub_80F1778(void)
+{
+    switch (gUnknown_083DFEC4->unkD160)
+    {
+    case 0:
+        sub_80EEDE8();
+        gUnknown_083DFEC4->unkD162 = 2;
+        break;
+    case 1:
+        sub_80F1614();
+        break;
+    case 2:
+        if (sub_80F162C(0))
+            return TRUE;
+        break;
+    case 3:
+        LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)(VRAM + 0x5000));
+        break;
+    case 4:
+        LZ77UnCompVram(gUnknown_08E9AC4C, (void *)(VRAM + 0xF000));
+        LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20);
+        break;
+    case 5:
+        sub_8095C8C((void *)VRAM + 0xF000, 0, 13, gUnknown_083E01F4, 0, 0, 12, 4, 12);
+        break;
+    case 6:
+        LZ77UnCompVram(gUnknown_08E9FEB4, (void *)(VRAM + 0xB800));
+        break;
+    case 7:
+        LoadPalette(gUnknown_083E0254, 0x30, 0x20);
+        LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20);
+        LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2);
+        LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2);
+        LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2);
+        sub_80F01A4();
+        break;
+    case 8:
+        sub_80F01E0(gUnknown_083DFEC4->unk8fe9);
+        break;
+    case 9:
+        REG_BG3CNT = 0x1E03;
+        REG_BG2CNT = 0x1702;
+        REG_BLDCNT = 0x844;
+        REG_BLDALPHA = 0x40B;
+        break;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unkD160++;
+    return TRUE;
+}
+
+void sub_80F1934(void)
+{
+    u8 *buffer = gUnknown_083DFEC4->unk8788;
+    if (gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk4)
+    {
+        u8 nature = GetNature(&gPlayerParty[sub_8137124(gUnknown_083DFEC4->unk87DC)]);
+        buffer = StringCopy(buffer, gOtherText_Nature2);
+        AlignStringInMenuWindow(buffer, gNatureNames[nature], 87, 0);
+    }
+    else
+    {
+        AlignStringInMenuWindow(buffer, gEmptyString_81E72B0, 87, 0);
+    }
+
+    Menu_PrintTextPixelCoords(gUnknown_083DFEC4->unk8788, 1, 112, 1);
+}
+
+static void sub_80F19DC(u8 *text)
+{
+    while (text[0] != EOS)
+    {
+        if (text[0] == EXT_CTRL_CODE_BEGIN && text[1] == CHAR_SPACE)
+        {
+            text[0] = EOS;
+            break;
+        }
+
+        text++;
+    }
+}
+
+static void sub_80F19FC(void)
+{
+    // FIXME r4/r5 swapped
+    register u8 *ptr asm("r5") = gUnknown_020388B0;
+    if (ptr[0] == 1)
+    {
+        const u8 *landmarkName = GetLandmarkName(
+            gUnknown_083DFEC4->regionMap.mapSectionId,
+            gUnknown_083DFEC4->regionMap.everGrandeCityArea,
+            ptr[1]);
+
+        if (landmarkName)
+        {
+            sub_8072A18(landmarkName, 0x70, 4 * (ptr[1] * 4 + 12), 0x78, 1);
+            if (++ptr[1] != 4)
+                return;
+        }
+
+        Menu_BlankWindowRect(14, ptr[1] * 2 + 6, 28, 15);
+        ptr[0] = 0;
+    }
+}
+
+static void sub_80F1A74(void)
+{
+    gUnknown_020388B0[0] = 0;
+}
+
+static void sub_80F1A80(void)
+{
+    gUnknown_020388B0[0] = 1;
+    gUnknown_020388B0[1] = 0;
+}
+
+static void sub_80F1A90(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (gUnknown_083DFEC4->unk6DAC == 0)
+        while (sub_80F1AC4());
+}
+
+static bool8 sub_80F1AC4(void)
+{
+    u16 i, j;
+
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        for (i = 0; i < 6; i++)
+        {
+            for (j = 0; j < 4; j++)
+                gUnknown_083DFEC4->unk320[i][j] = NULL;
+        }
+
+        gUnknown_083DFEC4->unk311 = 0;
+        break;
+    case 1:
+        LZ77UnCompWram(gPokenavMenuOptions_Gfx, gUnknown_083DFEC4->unk388);
+        break;
+    case 2:
+        LZ77UnCompWram(gPokenavConditionMenu_Gfx, gUnknown_083DFEC4->unk1788);
+        break;
+    case 3:
+        LZ77UnCompWram(gPokenavConditionSearch_Gfx, gUnknown_083DFEC4->unk2388);
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+
+static void sub_80F1B8C(u8 arg0)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (gUnknown_083DFEC4->unk6DAC == 0)
+        while (sub_80F1BC8(arg0));
+}
+
+#ifdef NONMATCHING
+// very close, but for some reason, (i + 1) is being stored in sp[0x10]
+static bool8 sub_80F1BC8(u8 arg0)
+{
+    u16 i, j;
+    u16 animNum;
+    u16 topOffset;
+    u16 height;
+    u16 middle;
+    u8 spriteId;
+
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        sub_80F2458(arg0);
+        break;
+    case 1:
+        sub_80F2514(arg0);
+        break;
+    case 2:
+        switch (arg0)
+        {
+        case 0:
+            topOffset = 42;
+            height = 20;
+            gUnknown_083DFEC4->unk30E = 5;
+            break;
+        case 1:
+            topOffset = 56;
+            height = 20;
+            gUnknown_083DFEC4->unk30E = 3;
+            break;
+        case 2:
+            topOffset = 40;
+            height = 16;
+            gUnknown_083DFEC4->unk30E = 6;
+            break;
+        default:
+            return FALSE;
+        }
+
+        animNum = 0;
+        for (i = 0; i < gUnknown_083DFEC4->unk30E; i++)
+        {
+            middle = (height * i) + topOffset - 8;
+            gUnknown_083DFEC4->unk314[i] = (middle << 8) | (middle + 0x11);
+            if (!arg0)
+            {
+                if (gUnknown_083DFEC4->unk6DB2[i] == 0)
+                {
+                    for (j = 0; j < 4; j++)
+                        gUnknown_083DFEC4->unk320[i][j] = NULL;
+                    continue;
+                }
+                else
+                {
+                    animNum = (gUnknown_083DFEC4->unk6DB2[i] - 1) * 4;
+                }
+            }
+
+            for (j = 0; j < 4; j++)
+            {
+                spriteId = CreateSprite(&gSpriteTemplate_83E4454, j * 32 + 256, (height * i) + topOffset, 0);
+                if (spriteId != MAX_SPRITES)
+                {
+                    gUnknown_083DFEC4->unk320[i][j] = &gSprites[spriteId];
+                    gUnknown_083DFEC4->unk320[i][j]->data[0] = i;
+                    gUnknown_083DFEC4->unk320[i][j]->data[1] = j;
+                    gUnknown_083DFEC4->unk320[i][j]->data[2] = j * 32 + 152;
+                    gUnknown_083DFEC4->unk320[i][j]->data[3] = j * 32 + 256;
+                    StartSpriteAnim(gUnknown_083DFEC4->unk320[i][j], animNum++);
+
+                    if ((arg0 == 2 || arg0 == 0) && i > 2)
+                        gUnknown_083DFEC4->unk320[i][j]->oam.paletteNum = IndexOfSpritePaletteTag(0x1);
+                }
+            }
+        }
+        break;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+#else
+NAKED
+static bool8 sub_80F1BC8(u8 arg0)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0xC\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r9, r0\n\
+    ldr r1, _080F1BF4 @ =gUnknown_083DFEC4\n\
+    ldr r2, [r1]\n\
+    ldr r3, _080F1BF8 @ =0x00000306\n\
+    adds r0, r2, r3\n\
+    ldrh r0, [r0]\n\
+    adds r3, r1, 0\n\
+    cmp r0, 0x1\n\
+    beq _080F1C0A\n\
+    cmp r0, 0x1\n\
+    bgt _080F1BFC\n\
+    cmp r0, 0\n\
+    beq _080F1C02\n\
+    b _080F1DC4\n\
     .align 2, 0\n\
-_080F0530: .4byte 0x0600e800\n\
-_080F0534: .4byte gUnknown_08E9FE54\n\
-_080F0538: .4byte gUnknown_08E9FD64\n\
-_080F053C:\n\
-    ldr r0, _080F0548 @ =gUnknown_083E0354\n\
-    ldr r1, _080F054C @ =0x06005000\n\
-    bl LZ77UnCompVram\n\
-    b _080F0618\n\
+_080F1BF4: .4byte gUnknown_083DFEC4\n\
+_080F1BF8: .4byte 0x00000306\n\
+_080F1BFC:\n\
+    cmp r0, 0x2\n\
+    beq _080F1C12\n\
+    b _080F1DC4\n\
+_080F1C02:\n\
+    mov r0, r9\n\
+    bl sub_80F2458\n\
+    b _080F1DC8\n\
+_080F1C0A:\n\
+    mov r0, r9\n\
+    bl sub_80F2514\n\
+    b _080F1DC8\n\
+_080F1C12:\n\
+    mov r4, r9\n\
+    cmp r4, 0x1\n\
+    beq _080F1C40\n\
+    cmp r4, 0x1\n\
+    bgt _080F1C22\n\
+    cmp r4, 0\n\
+    beq _080F1C2A\n\
+    b _080F1DC4\n\
+_080F1C22:\n\
+    mov r5, r9\n\
+    cmp r5, 0x2\n\
+    beq _080F1C54\n\
+    b _080F1DC4\n\
+_080F1C2A:\n\
+    movs r0, 0x2A\n\
+    str r0, [sp, 0x4]\n\
+    movs r1, 0x14\n\
+    str r1, [sp, 0x8]\n\
+    ldr r4, _080F1C3C @ =0x0000030e\n\
+    adds r1, r2, r4\n\
+    movs r0, 0x5\n\
+    b _080F1C62\n\
     .align 2, 0\n\
-_080F0548: .4byte gUnknown_083E0354\n\
-_080F054C: .4byte 0x06005000\n\
-_080F0550:\n\
-    ldr r2, _080F0568 @ =0x0600f800\n\
-    add r1, sp, 0x14\n\
-    movs r0, 0\n\
-    strh r0, [r1]\n\
-    ldr r0, _080F056C @ =0x040000d4\n\
-    str r1, [r0]\n\
-    str r2, [r0, 0x4]\n\
-    ldr r1, _080F0570 @ =0x81000400\n\
-    str r1, [r0, 0x8]\n\
-    ldr r0, [r0, 0x8]\n\
-    b _080F0618\n\
+_080F1C3C: .4byte 0x0000030e\n\
+_080F1C40:\n\
+    movs r5, 0x38\n\
+    str r5, [sp, 0x4]\n\
+    movs r0, 0x14\n\
+    str r0, [sp, 0x8]\n\
+    ldr r4, _080F1C50 @ =0x0000030e\n\
+    adds r1, r2, r4\n\
+    movs r0, 0x3\n\
+    b _080F1C62\n\
     .align 2, 0\n\
-_080F0568: .4byte 0x0600f800\n\
-_080F056C: .4byte 0x040000d4\n\
-_080F0570: .4byte 0x81000400\n\
-_080F0574:\n\
-    bl sub_80F0900\n\
-    b _080F0618\n\
-_080F057A:\n\
-    bl sub_80F0944\n\
+_080F1C50: .4byte 0x0000030e\n\
+_080F1C54:\n\
+    movs r5, 0x28\n\
+    str r5, [sp, 0x4]\n\
+    movs r0, 0x10\n\
+    str r0, [sp, 0x8]\n\
+    ldr r4, _080F1CDC @ =0x0000030e\n\
+    adds r1, r2, r4\n\
+    movs r0, 0x6\n\
+_080F1C62:\n\
+    strb r0, [r1]\n\
+    movs r5, 0\n\
+    str r5, [sp]\n\
+    mov r8, r5\n\
+    adds r1, r3, 0\n\
+    ldr r0, [r1]\n\
+    ldr r2, _080F1CDC @ =0x0000030e\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
     lsls r0, 24\n\
+    asrs r0, 24\n\
+    cmp r8, r0\n\
+    blt _080F1C7E\n\
+    b _080F1DC8\n\
+_080F1C7E:\n\
+    ldr r4, [sp, 0x8]\n\
+    mov r3, r8\n\
+    muls r3, r4\n\
+    ldr r5, [sp, 0x4]\n\
+    adds r0, r5, r3\n\
+    subs r0, 0x8\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    ldr r4, [r1]\n\
+    mov r2, r8\n\
+    lsls r1, r2, 1\n\
+    movs r5, 0xC5\n\
+    lsls r5, 2\n\
+    adds r2, r4, r5\n\
+    adds r2, r1\n\
+    lsls r1, r0, 8\n\
+    adds r0, 0x11\n\
+    orrs r1, r0\n\
+    strh r1, [r2]\n\
+    mov r0, r9\n\
     cmp r0, 0\n\
-    beq _080F0618\n\
-    b _080F0626\n\
-_080F0586:\n\
-    ldr r0, _080F059C @ =gUnknown_083DFEC4\n\
-    ldr r4, [r0]\n\
-    ldr r1, _080F05A0 @ =0x000087ca\n\
+    bne _080F1CF2\n\
+    ldr r1, _080F1CE0 @ =0x00006db2\n\
     adds r0, r4, r1\n\
-    ldrb r0, [r0]\n\
-    cmp r0, 0x2\n\
-    beq _080F05A4\n\
-    bl ShowMapNamePopUpWindow\n\
-    b _080F0618\n\
-    .align 2, 0\n\
-_080F059C: .4byte gUnknown_083DFEC4\n\
-_080F05A0: .4byte 0x000087ca\n\
-_080F05A4:\n\
-    movs r0, 0\n\
-    bl sub_80F081C\n\
-    ldr r2, _080F05B8 @ =0x0000876e\n\
-    adds r0, r4, r2\n\
-    ldrb r0, [r0]\n\
-    bl sub_80F0FFC\n\
-    b _080F0618\n\
+    mov r2, r8\n\
+    adds r1, r0, r2\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0\n\
+    bne _080F1CE8\n\
+    movs r5, 0\n\
+    ldr r0, _080F1CE4 @ =gUnknown_083DFEC4\n\
+    ldr r0, [r0]\n\
+    lsls r2, 4\n\
+    movs r3, 0xC8\n\
+    lsls r3, 2\n\
+    adds r1, r0, r3\n\
+    movs r3, 0\n\
+_080F1CC8:\n\
+    lsls r0, r5, 2\n\
+    adds r0, r2\n\
+    adds r0, r1, r0\n\
+    str r3, [r0]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x3\n\
+    bls _080F1CC8\n\
+    b _080F1D92\n\
     .align 2, 0\n\
-_080F05B8: .4byte 0x0000876e\n\
-_080F05BC:\n\
-    ldr r1, _080F0600 @ =REG_BG2CNT\n\
-    ldr r3, _080F0604 @ =0x00001d0a\n\
-    adds r0, r3, 0\n\
-    strh r0, [r1]\n\
-    adds r1, 0x2\n\
-    adds r3, 0xF9\n\
-    adds r0, r3, 0\n\
-    strh r0, [r1]\n\
-    subs r1, 0x6\n\
-    adds r3, 0xFE\n\
-    adds r0, r3, 0\n\
-    strh r0, [r1]\n\
-    adds r1, 0x16\n\
-    movs r0, 0xF8\n\
-    strh r0, [r1]\n\
-    ldr r1, [r2]\n\
-    ldr r0, _080F0608 @ =0x00008776\n\
-    adds r2, r1, r0\n\
+_080F1CDC: .4byte 0x0000030e\n\
+_080F1CE0: .4byte 0x00006db2\n\
+_080F1CE4: .4byte gUnknown_083DFEC4\n\
+_080F1CE8:\n\
+    ldrb r0, [r1]\n\
+    subs r0, 0x1\n\
+    lsls r0, 18\n\
+    lsrs r0, 16\n\
+    str r0, [sp]\n\
+_080F1CF2:\n\
+    movs r5, 0\n\
+    ldr r4, [sp, 0x4]\n\
+    adds r0, r4, r3\n\
+    lsls r0, 16\n\
+    mov r10, r0\n\
+_080F1CFC:\n\
+    lsls r6, r5, 5\n\
+    movs r0, 0x80\n\
+    lsls r0, 1\n\
+    adds r7, r6, r0\n\
+    lsls r1, r7, 16\n\
+    asrs r1, 16\n\
+    ldr r0, _080F1DB4 @ =gSpriteTemplate_83E4454\n\
+    mov r3, r10\n\
+    asrs r2, r3, 16\n\
     movs r3, 0\n\
-    movs r0, 0xF8\n\
-    strh r0, [r2]\n\
-    ldr r2, _080F060C @ =0x00008778\n\
-    adds r0, r1, r2\n\
-    strh r3, [r0]\n\
-    ldr r0, _080F0610 @ =REG_BLDCNT\n\
-    strh r3, [r0]\n\
-    ldr r3, _080F0614 @ =0x0000d160\n\
-    adds r1, r3\n\
-    ldrh r0, [r1]\n\
+    bl CreateSprite\n\
+    lsls r0, 24\n\
+    lsrs r3, r0, 24\n\
+    cmp r3, 0x40\n\
+    beq _080F1DC4\n\
+    ldr r0, _080F1DB8 @ =gUnknown_083DFEC4\n\
+    ldr r2, [r0]\n\
+    lsls r1, r5, 2\n\
+    mov r4, r8\n\
+    lsls r0, r4, 4\n\
+    adds r1, r0\n\
+    movs r0, 0xC8\n\
+    lsls r0, 2\n\
+    adds r2, r0\n\
+    adds r4, r2, r1\n\
+    lsls r0, r3, 4\n\
+    adds r0, r3\n\
+    lsls r0, 2\n\
+    ldr r1, _080F1DBC @ =gSprites\n\
+    adds r0, r1\n\
+    str r0, [r4]\n\
+    mov r1, r8\n\
+    strh r1, [r0, 0x2E]\n\
+    ldr r0, [r4]\n\
+    strh r5, [r0, 0x30]\n\
+    ldr r1, [r4]\n\
+    adds r0, r6, 0\n\
+    adds r0, 0x98\n\
+    strh r0, [r1, 0x32]\n\
+    ldr r0, [r4]\n\
+    strh r7, [r0, 0x34]\n\
+    ldr r0, [r4]\n\
+    ldr r1, [sp]\n\
+    adds r2, r1, 0x1\n\
+    lsls r2, 16\n\
+    lsrs r2, 16\n\
+    str r2, [sp]\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    bl StartSpriteAnim\n\
+    mov r2, r9\n\
+    cmp r2, 0x2\n\
+    beq _080F1D6E\n\
+    cmp r2, 0\n\
+    bne _080F1D88\n\
+_080F1D6E:\n\
+    mov r3, r8\n\
+    cmp r3, 0x2\n\
+    bls _080F1D88\n\
+    movs r0, 0x1\n\
+    bl IndexOfSpritePaletteTag\n\
+    ldr r3, [r4]\n\
+    lsls r0, 4\n\
+    ldrb r2, [r3, 0x5]\n\
+    movs r1, 0xF\n\
+    ands r1, r2\n\
+    orrs r1, r0\n\
+    strb r1, [r3, 0x5]\n\
+_080F1D88:\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x3\n\
+    bls _080F1CFC\n\
+_080F1D92:\n\
+    mov r0, r8\n\
     adds r0, 0x1\n\
-    strh r0, [r1]\n\
-_080F05FA:\n\
-    movs r0, 0\n\
-    b _080F0628\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r8, r0\n\
+    ldr r1, _080F1DB8 @ =gUnknown_083DFEC4\n\
+    ldr r0, [r1]\n\
+    ldr r4, _080F1DC0 @ =0x0000030e\n\
+    adds r0, r4\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    cmp r8, r0\n\
+    bge _080F1DB0\n\
+    b _080F1C7E\n\
+_080F1DB0:\n\
+    b _080F1DC8\n\
     .align 2, 0\n\
-_080F0600: .4byte REG_BG2CNT\n\
-_080F0604: .4byte 0x00001d0a\n\
-_080F0608: .4byte 0x00008776\n\
-_080F060C: .4byte 0x00008778\n\
-_080F0610: .4byte REG_BLDCNT\n\
-_080F0614: .4byte 0x0000d160\n\
-_080F0618:\n\
-    ldr r0, _080F0634 @ =gUnknown_083DFEC4\n\
+_080F1DB4: .4byte gSpriteTemplate_83E4454\n\
+_080F1DB8: .4byte gUnknown_083DFEC4\n\
+_080F1DBC: .4byte gSprites\n\
+_080F1DC0: .4byte 0x0000030e\n\
+_080F1DC4:\n\
+    movs r0, 0\n\
+    b _080F1DD8\n\
+_080F1DC8:\n\
+    ldr r0, _080F1DE8 @ =gUnknown_083DFEC4\n\
     ldr r1, [r0]\n\
-    ldr r0, _080F0638 @ =0x00000306\n\
-    adds r1, r0\n\
+    ldr r5, _080F1DEC @ =0x00000306\n\
+    adds r1, r5\n\
     ldrh r0, [r1]\n\
     adds r0, 0x1\n\
     strh r0, [r1]\n\
-_080F0626:\n\
     movs r0, 0x1\n\
-_080F0628:\n\
-    add sp, 0x18\n\
-    pop {r3}\n\
+_080F1DD8:\n\
+    add sp, 0xC\n\
+    pop {r3-r5}\n\
     mov r8, r3\n\
-    pop {r4-r6}\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
     pop {r1}\n\
     bx r1\n\
     .align 2, 0\n\
-_080F0634: .4byte gUnknown_083DFEC4\n\
-_080F0638: .4byte 0x00000306\n\
+_080F1DE8: .4byte gUnknown_083DFEC4\n\
+_080F1DEC: .4byte 0x00000306\n\
     .syntax divided\n");
 }
 #endif // NONMATCHING
+
+static void sub_80F1DF0(void)
+{
+    u16 i, j;
+    for (i = 0; i < gUnknown_083DFEC4->unk30E; i++)
+    {
+        for (j = 0; j < 4; j++)
+        {
+            if (gUnknown_083DFEC4->unk320[i][j])
+                gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2218;
+        }
+    }
+
+    PlaySE(SE_WIN_OPEN);
+}
+
+static bool8 sub_80F1E50(void)
+{
+    if (sub_80F22F8())
+    {
+        sub_80F2108();
+        return FALSE;
+    }
+    else
+    {
+        return TRUE;
+    }
+}
+
+static bool8 sub_80F1E6C(void)
+{
+    return !sub_80F22F8();
+}
+
+static void sub_80F1E84(void)
+{
+    u16 i, j;
+
+    gUnknown_083DFEC4->unk30F = 0;
+    sub_80F2148();
+    for (i = 0; i < gUnknown_083DFEC4->unk30E; i++)
+    {
+        if (i != gUnknown_083DFEC4->unk6DAD)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                if (gUnknown_083DFEC4->unk320[i][j])
+                    gUnknown_083DFEC4->unk320[i][j]->callback = sub_80F2240;
+            }
+        }
+    }
+}
+
+static bool8 sub_80F1F10(void)
+{
+    u16 j;
+
+    switch (gUnknown_083DFEC4->unk30F)
+    {
+    case 0:
+        if (sub_80F2360())
+        {
+            for (j = 0; j < 4; j++)
+            {
+                struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j];
+                sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
+                sprite->affineAnims = gSpriteAffineAnimTable_83E4450;
+                InitSpriteAffineAnim(sprite);
+                sprite->data[4] = j * 4 - 6;
+                sprite->data[4] /= 2;
+                sprite->data[5] = sprite->data[4] * 8;
+                sprite->callback = sub_80F2240;
+            }
+
+            sub_80F2170();
+            gUnknown_083DFEC4->unk30F++;
+        }
+        break;
+    case 1:
+        if (sub_80F23C8())
+        {
+            sub_80F21F8();
+            FreeSpriteTilesByTag(0x0);
+            FreeSpritePaletteByTag(0x0);
+            FreeSpritePaletteByTag(0x1);
+            return FALSE;
+        }
+        break;
+    }
+
+    return TRUE;
+}
+
+static void sub_80F1FF0(void)
+{
+    if (gUnknown_083DFEC4->unk311 == 1)
+    {
+        REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD];
+        REG_BLDY = gSineTable[gUnknown_083DFEC4->unk312] >> 5;
+        gUnknown_083DFEC4->unk312 += 3;
+        gUnknown_083DFEC4->unk312 &= 0x7F;
+    }
+    else if (gUnknown_083DFEC4->unk311 == 2)
+    {
+        REG_BLDALPHA = gUnknown_083E42F8[gUnknown_083DFEC4->unk312];
+        if (gUnknown_083DFEC4->unk312 < 15)
+            gUnknown_083DFEC4->unk312++;
+    }
+}
+
+static void sub_80F208C(void)
+{
+    sub_80F2148();
+}
+
+static void sub_80F2098(void)
+{
+    REG_WIN0H = 0x77F0;
+    REG_WIN0V = gUnknown_083DFEC4->unk314[gUnknown_083DFEC4->unk6DAD];
+    REG_WININ = 0x3F;
+    REG_WINOUT = 0x1F;
+    REG_DISPCNT |= DISPCNT_WIN0_ON;
+}
+
+static void sub_80F20F4(void)
+{
+    REG_DISPCNT &= ~DISPCNT_WIN0_ON;
+}
+
+static void sub_80F2108(void)
+{
+    if (!gUnknown_083DFEC4->unk311)
+    {
+        gUnknown_083DFEC4->unk311 = 1;
+        gUnknown_083DFEC4->unk312 = 0;
+        REG_BLDCNT = 0x90;
+        REG_BLDY = 0;
+        sub_80F2098();
+    }
+}
+
+static void sub_80F2148(void)
+{
+    gUnknown_083DFEC4->unk311 = 0;
+    REG_BLDCNT = 0;
+    sub_80F20F4();
+}
+
+static void sub_80F2170(void)
+{
+    u16 j;
+
+    if (!gUnknown_083DFEC4->unk311)
+    {
+        sub_80F20F4();
+        for (j = 0; j < 4; j++)
+        {
+            struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j];
+            sprite->oam.objMode = ST_OAM_OBJ_BLEND;
+        }
+
+        gUnknown_083DFEC4->unk311 = 2;
+        gUnknown_083DFEC4->unk312 = 0;
+        REG_BLDCNT = 0x3F40;
+        REG_BLDALPHA = 0x10;
+    }
+}
+
+static void sub_80F21F8()
+{
+    gUnknown_083DFEC4->unk311 = 0;
+    REG_BLDCNT = 0;
+}
+
+static void sub_80F2218(struct Sprite *sprite)
+{
+    sprite->pos1.x -= 8;
+    if (sprite->pos1.x <= sprite->data[2])
+    {
+        sprite->pos1.x = sprite->data[2];
+        sprite->callback = sub_80F22B0;
+    }
+}
+
+static void sub_80F2240(struct Sprite *sprite)
+{
+    if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD)
+    {
+        if (sprite->data[5])
+        {
+            sprite->pos1.x += sprite->data[4];
+            sprite->data[5] -= sprite->data[4];
+        }
+
+        if (sprite->affineAnimEnded)
+            sub_80F240C(sprite);
+    }
+    else
+    {
+        sprite->pos1.x += 8;
+        if (sprite->pos1.x >= sprite->data[3])
+            sub_80F240C(sprite);
+    }
+}
+
+static void sub_80F22B0(struct Sprite *sprite)
+{
+    if (sprite->data[0] == gUnknown_083DFEC4->unk6DAD)
+    {
+        if (sprite->pos2.x > -16)
+            sprite->pos2.x -= 4;
+    }
+    else
+    {
+        if (sprite->pos2.x < 0)
+            sprite->pos2.x += 4;
+    }
+}
+
+static bool8 sub_80F22F8(void)
+{
+    u16 i, j;
+
+    for (i = 0; i < gUnknown_083DFEC4->unk6DAE; i++)
+    {
+        for (j = 0; j < 4; j++)
+        {
+            struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j];
+            if (!sprite)
+                return TRUE;
+
+            if (sprite->pos2.x != 0 && sprite->pos2.x != -16)
+                return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+static bool8 sub_80F2360(void)
+{
+    u16 i, j;
+
+    for (i = 0; i < gUnknown_083DFEC4->unk30E; i++)
+    {
+        if (i != gUnknown_083DFEC4->unk6DAD)
+        {
+            for (j = 0; j < 4; j++)
+            {
+                struct Sprite *sprite = gUnknown_083DFEC4->unk320[i][j];
+                if (sprite)
+                    return FALSE;
+            }
+        }
+    }
+
+    return TRUE;
+}
+
+static bool8 sub_80F23C8(void)
+{
+    u16 j;
+
+    for (j = 0; j < 4; j++)
+    {
+        struct Sprite *sprite = gUnknown_083DFEC4->unk320[gUnknown_083DFEC4->unk6DAD][j];
+        if (sprite)
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+static void sub_80F240C(struct Sprite *sprite)
+{
+    gUnknown_083DFEC4->unk320[sprite->data[0]][sprite->data[1]] = NULL;
+    if (sprite->affineAnimEnded)
+        FreeOamMatrix(sprite->oam.matrixNum);
+
+    DestroySprite(sprite);
+}
+
+static void sub_80F2458(u8 arg0)
+{
+    switch (arg0)
+    {
+    case 0:
+        gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk388;
+        gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk388);
+        gUnknown_083DFEC4->unk380.tag = 0x0;
+        break;
+    case 1:
+        gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk1788;
+        gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk1788);
+        gUnknown_083DFEC4->unk380.tag = 0x0;
+        break;
+    case 2:
+        gUnknown_083DFEC4->unk380.data = gUnknown_083DFEC4->unk2388;
+        gUnknown_083DFEC4->unk380.size = sizeof(gUnknown_083DFEC4->unk2388);
+        gUnknown_083DFEC4->unk380.tag = 0x0;
+        break;
+    default:
+        return;
+    }
+
+    LoadSpriteSheet(&gUnknown_083DFEC4->unk380);
+}
+
+static void sub_80F2514(u8 arg0)
+{
+    struct SpritePalette spritePalette;
+
+    switch (arg0)
+    {
+    case 0:
+        spritePalette.data = gPokenavMenuOptions1_Pal;
+        spritePalette.tag = 0;
+        LoadSpritePalette(&spritePalette);
+        spritePalette.data = gPokenavMenuOptions2_Pal;
+        spritePalette.tag = 0x1;
+        break;
+    case 1:
+        spritePalette.data = gPokenavConditionMenu_Pal;
+        spritePalette.tag = 0x0;
+        break;
+    case 2:
+        spritePalette.data = gPokenavCondition6_Pal;
+        spritePalette.tag = 0;
+        LoadSpritePalette(&spritePalette);
+        spritePalette.data = gPokenavCondition7_Pal;
+        spritePalette.tag = 0x1;
+        break;
+    default:
+        return;
+    }
+
+    LoadSpritePalette(&spritePalette);
+}
+
+static void sub_80F2598(void)
+{
+    u8 spriteId;
+
+    gUnknown_083DFEC4->unk6D9C = NULL;
+    if (DoesSomeoneWantRematchIn(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum) == TRUE)
+    {
+        LoadSpriteSheet(&gSpriteSheet_PokenavBlueLight);
+        LoadSpritePalette(&gSpritePalette_PokenavBlueLight);
+        spriteId = CreateSprite(&gSpriteTemplate_83E4484, 12, 96, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gUnknown_083DFEC4->unk6D9C = &gSprites[spriteId];
+        }
+        else
+        {
+            FreeSpriteTilesByTag(0x19);
+            FreeSpritePaletteByTag(0x11);
+        }
+    }
+}
+
+static void sub_80F2620(void)
+{
+    if (gUnknown_083DFEC4->unk6D9C)
+    {
+        DestroySprite(gUnknown_083DFEC4->unk6D9C);
+        FreeSpriteTilesByTag(0x19);
+        FreeSpritePaletteByTag(0x11);
+        gUnknown_083DFEC4->unk6D9C = NULL;
+    }
+}
+
+void sub_80F2654(struct Sprite *sprite)
+{
+    if (++sprite->data[0] > 6)
+    {
+        sprite->data[0] = 0;
+        sprite->invisible = !sprite->invisible;
+    }
+}
+
+void sub_80F2688(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while(sub_80F26BC());
+}
+
+static bool8 sub_80F26BC(void)
+{
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        LZ77UnCompWram(gPokenavMainMenu_Gfx, gUnknown_083DFEC4->unk3B98);
+        break;
+    case 1:
+        LZ77UnCompWram(gPokenavConditionMenuHeader_Gfx, gUnknown_083DFEC4->unk4198);
+        break;
+    case 2:
+        LZ77UnCompWram(gPokenavRibbonsHeader_Gfx, gUnknown_083DFEC4->unk4D98);
+        break;
+    case 3:
+        LZ77UnCompWram(gPokenavHoennMapHeader_Gfx, gUnknown_083DFEC4->unk5398);
+        break;
+    case 4:
+        LZ77UnCompWram(gPokenavConditionMenuOptions_Gfx, gUnknown_083DFEC4->unk5F98);
+        break;
+    case 5:
+        LZ77UnCompWram(gPokenavConditionMenuOptions2_Gfx, gUnknown_083DFEC4->unk6798);
+        break;
+    case 6:
+        LZ77UnCompWram(gPokenavTrainersEyesHeader_Gfx, gUnknown_083DFEC4->unk4798);
+        break;
+    case 7:
+        LoadSpritePalettes(gUnknown_083E449C);
+        break;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+
+static void sub_80F27DC(u8 arg0)
+{
+    struct SpriteSheet spriteSheet;
+
+    switch (arg0)
+    {
+    case 0:
+        spriteSheet.data = gUnknown_083DFEC4->unk3B98;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk3B98);
+        spriteSheet.tag = 0x1;
+        break;
+    case 1:
+        spriteSheet.data = gUnknown_083DFEC4->unk4198;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4198);
+        spriteSheet.tag = 0x1;
+        break;
+    case 3:
+        spriteSheet.data = gUnknown_083DFEC4->unk4798;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4798);
+        spriteSheet.tag = 0x1;
+        break;
+    case 2:
+        spriteSheet.data = gUnknown_083DFEC4->unk4D98;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk4D98);
+        spriteSheet.tag = 0x1;
+        break;
+    case 4:
+        spriteSheet.data = gUnknown_083DFEC4->unk5398;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5398);
+        spriteSheet.tag = 0x1;
+        break;
+    case 5:
+        spriteSheet.data = gUnknown_083DFEC4->unk5F98;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk5F98);
+        spriteSheet.tag = 0x2;
+        break;
+    case 6:
+        spriteSheet.data = gUnknown_083DFEC4->unk6198;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6198);
+        spriteSheet.tag = 0x2;
+        break;
+    case 8:
+        spriteSheet.data = gUnknown_083DFEC4->unk6398;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6398);
+        spriteSheet.tag = 0x2;
+        break;
+    case 9:
+        spriteSheet.data = gUnknown_083DFEC4->unk6598;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6598);
+        spriteSheet.tag = 0x2;
+        break;
+    case 11:
+        spriteSheet.data = gUnknown_083DFEC4->unk6998;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6998);
+        spriteSheet.tag = 0x2;
+        break;
+    case 10:
+        spriteSheet.data = gUnknown_083DFEC4->unk6798;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6798);
+        spriteSheet.tag = 0x2;
+        break;
+    case 7:
+        spriteSheet.data = gUnknown_083DFEC4->unk6B98;
+        spriteSheet.size = sizeof(gUnknown_083DFEC4->unk6B98);
+        spriteSheet.tag = 0x2;
+        break;
+    default:
+        return;
+    }
+
+    LoadSpriteSheet(&spriteSheet);
+}
+
+void sub_80F29B8(u8 arg0)
+{
+    u16 i;
+    s16 deltaX, endX, initialX;
+    u16 y;
+    s16 width;
+    struct Sprite **sprites;
+    const struct SpriteTemplate *spriteTemplate;
+    u8 spriteId;
+
+    spriteTemplate = NULL;
+    switch (arg0)
+    {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+        initialX = -96;
+        y = 49 - gUnknown_083DFEC4->unk030C;
+        deltaX = 8;
+        endX = 32;
+        width = 64;
+        sprites = gUnknown_083DFEC4->unk3B88;
+        spriteTemplate = arg0 != 3 ? &gSpriteTemplate_83E44E0 : &gSpriteTemplate_83E44F8;
+        break;
+    case 4:
+        initialX = 272;
+        y = 49 - gUnknown_083DFEC4->unk030C;
+        deltaX = -8;
+        endX = 152;
+        width = 64;
+        spriteTemplate = &gSpriteTemplate_83E44E0;
+        sprites = gUnknown_083DFEC4->unk3B88;
+        break;
+    case 5:
+    case 6:
+    case 8:
+    case 9:
+        spriteTemplate = &gSpriteTemplate_83E4530;
+        // fall through
+    case 7:
+    case 10:
+    case 11:
+        if (spriteTemplate == NULL)
+            spriteTemplate = &gSpriteTemplate_83E4548;
+
+        initialX = -96;
+        y = 68 - gUnknown_083DFEC4->unk030C;
+        deltaX = 8;
+        endX = 16;
+        width = 32;
+        sprites = gUnknown_083DFEC4->unk3B90;
+        break;
+    default:
+        return;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        spriteId = CreateSprite(spriteTemplate, i * width + initialX, y, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gSprites[spriteId].data[0] = deltaX;
+            gSprites[spriteId].data[1] =  endX + i * width;
+            gSprites[spriteId].data[2] = i;
+            gSprites[spriteId].data[3] = arg0;
+            if (arg0 == 4 && i == 1)
+            {
+                int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2;
+                StartSpriteAnim(&gSprites[spriteId], anim);
+            }
+            else
+            {
+                StartSpriteAnim(&gSprites[spriteId], i);
+            }
+
+            if (arg0 < 4 && i == 1)
+            {
+                gSprites[spriteId].oam.shape = ST_OAM_SQUARE;
+                gSprites[spriteId].oam.size = 2;
+            }
+
+            sprites[i] = &gSprites[spriteId];
+        }
+    }
+}
+
+#define sEndX sprite->data[1]
+void sub_80F2BBC(struct Sprite *sprite)
+{
+    s16 x = sprite->pos1.x;
+    sprite->pos1.x += sprite->data[0];
+    if ((x <= sEndX && sprite->pos1.x >= sEndX) || (x >= sEndX && sprite->pos1.x <= sEndX))
+    {
+        sprite->pos1.x = sEndX;
+        if (sprite->data[3] == 4 && sprite->data[2] == 1)
+            sprite->callback = sub_80F2C58;
+        else
+            sprite->callback = SpriteCallbackDummy;
+    }
+}
+#undef sEndX
+
+static void sub_80F2C14(struct Sprite *sprite)
+{
+    u16 right;
+
+    sprite->pos1.x -= sprite->data[0];
+    right = sprite->pos1.x + 32;
+    if (right > 304)
+    {
+        if (sprite->data[2] == 1)
+        {
+            if (sprite->data[3] < 5)
+                FreeSpriteTilesByTag(0x1);
+            else
+                FreeSpriteTilesByTag(0x2);
+        }
+
+        DestroySprite(sprite);
+    }
+}
+
+static void sub_80F2C58(struct Sprite *sprite)
+{
+    int anim = !gUnknown_083DFEC4->regionMap.zoomed ? 1 : 2;
+    StartSpriteAnim(sprite, anim);
+}
+
+void sub_80F2C80(u8 arg0)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F2CBC(arg0));
+}
+
+bool8 sub_80F2CBC(u8 arg0)
+{
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        sub_80F27DC(arg0);
+        gUnknown_083DFEC4->unk306++;
+        return TRUE;
+    case 1:
+        sub_80F29B8(arg0);
+        gUnknown_083DFEC4->unk306++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+}
+
+static void sub_80F2D04(u8 arg0)
+{
+    u16 i;
+
+    if (arg0 < 5)
+    {
+        for (i = 0; i < 2; i++)
+            gUnknown_083DFEC4->unk3B88[i]->callback = sub_80F2C14;
+    }
+    else
+    {
+        for (i = 0; i < 2; i++)
+            gUnknown_083DFEC4->unk3B90[i]->callback = sub_80F2C14;
+    }
+}
+
+static void sub_80F2D6C(u8 arg0)
+{
+    u16 i;
+
+    if (arg0 < 5)
+    {
+        FreeSpriteTilesByTag(0x1);
+        for (i = 0; i < 2; i++)
+            DestroySprite(gUnknown_083DFEC4->unk3B88[i]);
+    }
+    else
+    {
+        FreeSpriteTilesByTag(0x2);
+        for (i = 0; i < 2; i++)
+            DestroySprite(gUnknown_083DFEC4->unk3B90[i]);
+    }
+}
+
+static void sub_80F2DD8(void)
+{
+    CreateRegionMapCursor(7, 7);
+    CreateRegionMapPlayerIcon(8, 8);
+    sub_80FBF94();
+}
+
+static void sub_80F2DF4(void)
+{
+    FreeRegionMapIconResources();
+}
+
+void sub_80F2E00(struct Sprite *sprite)
+{
+    sprite->pos1.x = gUnknown_083DFEC4->unk8766 + 38;
+}
+
+static void sub_80F2E18(u8 arg0)
+{
+    u8 spriteId;
+    struct SpriteTemplate spriteTemplate;
+    struct SpritePalette spritePalette;
+    struct SpriteSheet spriteSheet;
+
+    if (!gUnknown_083DFEC4->unk8768)
+    {
+        spriteSheet = gUnknown_083E4568;
+        spriteTemplate = gSpriteTemplate_83E4570;
+        spritePalette = gUnknown_083E4588;
+
+        spriteSheet.data = gUnknown_083DFEC4->unkD1E4[arg0];
+        spritePalette.data = gUnknown_083DFEC4->unk0[arg0];
+        gUnknown_083DFEC4->unkD1DC = LoadSpritePalette(&spritePalette);
+        gUnknown_083DFEC4->unkD1DE = LoadSpriteSheet(&spriteSheet);
+
+        spriteId = CreateSprite(&spriteTemplate, 38, 104, 0);
+        if (spriteId == MAX_SPRITES)
+        {
+            FreeSpriteTilesByTag(0x6);
+            FreeSpritePaletteByTag(0x6);
+            gUnknown_083DFEC4->unk8768 = NULL;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk8768 = &gSprites[spriteId];
+            gUnknown_083DFEC4->unkD1E0 = (void *)(VRAM + 0x10000) + gUnknown_083DFEC4->unkD1DE * 32;
+            gUnknown_083DFEC4->unkD1DC = gUnknown_083DFEC4->unkD1DC * 16 + 0x100;
+        }
+    }
+    else
+    {
+        DmaCopy16Defvars(3, gUnknown_083DFEC4->unkD1E4[arg0], gUnknown_083DFEC4->unkD1E0, 0x800);
+        LoadPalette(gUnknown_083DFEC4->unk0[arg0], gUnknown_083DFEC4->unkD1DC, 0x20);
+    }
+}
+
+void sub_80F2F48(void)
+{
+    if (gUnknown_083DFEC4->unk8768)
+    {
+        DestroySprite(gUnknown_083DFEC4->unk8768);
+        FreeSpriteTilesByTag(0x6);
+        FreeSpritePaletteByTag(0x6);
+        gUnknown_083DFEC4->unk8768 = NULL;
+    }
+}
+
+void sub_80F2F7C(u8 arg0)
+{
+    sub_80F2E18(arg0);
+    gUnknown_083DFEC4->unkCED0 = gUnknown_083DFEC4->unk8768;
+    gUnknown_083DFEC4->unkCED0->callback = sub_80F2FEC;
+}
+
+static void sub_80F2FB0(void)
+{
+    if (gUnknown_083DFEC4->unkCED0)
+    {
+        DestroySprite(gUnknown_083DFEC4->unkCED0);
+        FreeSpriteTilesByTag(0x6);
+        FreeSpritePaletteByTag(0x6);
+        gUnknown_083DFEC4->unkCED0 = NULL;
+        gUnknown_083DFEC4->unk8768 = NULL;
+    }
+}
+
+static void sub_80F2FEC(struct Sprite *sprite)
+{
+    sprite->pos1.x = gUnknown_083DFEC4->unkD15A + 40;
+    sprite->pos1.y = 104;
+}
+
+static void sub_80F3008(u8 arg0)
+{
+    u16 i;
+    u8 spriteId;
+    struct SpritePalette spritePalette;
+    struct SpriteSheet spriteSheets[3];
+
+    memcpy(spriteSheets, gUnknown_083E4590, sizeof(gUnknown_083E4590));
+    spritePalette = gUnknown_083E45A8;
+    switch (arg0)
+    {
+    case 1:
+    case 2:
+        spritePalette.data = gUnknown_08E9F988;
+        break;
+    }
+
+    LoadSpriteSheets(spriteSheets);
+    LoadSpritePalette(&spritePalette);
+    spriteId = CreateSprite(&gSpriteTemplate_83E45B8, 95, 0, 0);
+    if (spriteId == MAX_SPRITES)
+    {
+        gUnknown_083DFEC4->unk87CC = NULL;
+    }
+    else
+    {
+        gUnknown_083DFEC4->unk87CC = &gSprites[spriteId];
+        for (i = 0; i < 2; i++)
+        {
+            spriteId = CreateSprite(&gSpriteTemplate_83E45F0, 168, i * 128 + 8, 0);
+            if (spriteId != MAX_SPRITES)
+            {
+                gUnknown_083DFEC4->unk87D0[i] = &gSprites[spriteId];
+                gSprites[spriteId].invisible = 1;
+                gSprites[spriteId].data[0] = 0;
+                gSprites[spriteId].data[1] = 0;
+                gSprites[spriteId].data[2] = i == 0 ? -1 : 1;
+                gSprites[spriteId].data[3] = i;
+                gSprites[spriteId].data[4] = 1;
+                StartSpriteAnim(&gSprites[spriteId], i);
+            }
+            else
+            {
+                gUnknown_083DFEC4->unk87D0[i] = NULL;
+            }
+        }
+    }
+}
+
+static void sub_80F3130(void)
+{
+    u16 i;
+
+    if (gUnknown_083DFEC4->unk87CC)
+    {
+        DestroySprite(gUnknown_083DFEC4->unk87CC);
+        FreeSpriteTilesByTag(0x9);
+        FreeSpritePaletteByTag(0x9);
+        gUnknown_083DFEC4->unk87CC = NULL;
+    }
+
+    for (i = 0; i < 2; i++)
+    {
+        if (gUnknown_083DFEC4->unk87D0[i])
+        {
+            DestroySprite(gUnknown_083DFEC4->unk87D0[i]);
+            gUnknown_083DFEC4->unk87D0[i] = NULL;
+        }
+    }
+
+    FreeSpriteTilesByTag(0xA);
+}
+
+void sub_80F3190(struct Sprite *sprite)
+{
+    sprite->pos1.y = gUnknown_083DFEC4->unk876C * 16 + 16;
+}
+
+void sub_80F31AC(struct Sprite *sprite)
+{
+    if (gUnknown_083DFEC4->unk87C9)
+    {
+        if (sprite->data[4])
+        {
+            if (!sprite->data[3])
+                sprite->invisible = gUnknown_083DFEC4->unk8770 == 0;
+            else
+                sprite->invisible = gUnknown_083DFEC4->unk8772 == gUnknown_083DFEC4->unk8774;
+
+            sprite->data[4] = 0;
+        }
+
+        if (++sprite->data[0] > 4)
+        {
+            sprite->data[0] = 0;
+            if (++sprite->data[1] < 5)
+            {
+                sprite->pos2.y += sprite->data[2];
+            }
+            else
+            {
+                sprite->data[1] = 0;
+                sprite->pos2.y = 0;
+            }
+        }
+    }
+}
+
+static void sub_80F3264(void)
+{
+    u16 i;
+
+    for (i = 0; i < 2; i++)
+    {
+        if (gUnknown_083DFEC4->unk87D0[i])
+            gUnknown_083DFEC4->unk87D0[i]->data[4] = 1;
+    }
+}
+
+static void sub_80F3294(u8 arg0)
+{
+    gUnknown_083DFEC4->unk87CC->invisible = arg0;
+    if (gUnknown_083DFEC4->unk87C9)
+    {
+        if (arg0 == 1)
+        {
+            gUnknown_083DFEC4->unk87D0[0]->invisible = arg0;
+            gUnknown_083DFEC4->unk87D0[1]->invisible = arg0;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk87D0[0]->data[4] = 1;
+            gUnknown_083DFEC4->unk87D0[1]->data[4] = 1;
+        }
+    }
+}
+
+void sub_80F3328(struct Sprite *sprite)
+{
+    if (sprite->data[0] == gUnknown_083DFEC4->unk87DC)
+        StartSpriteAnim(sprite, 0);
+    else
+        StartSpriteAnim(sprite, 1);
+}
+
+static void sub_80F3360(struct Sprite *sprite)
+{
+    if (gUnknown_083DFEC4->unk87DC == gUnknown_083DFEC4->unk87DA - 1)
+        sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x4);
+    else
+        sprite->oam.paletteNum = IndexOfSpritePaletteTag(0x5);
+}
+
+void sub_80F33A8(void)
+{
+    u16 i;
+    u8 spriteId;
+    struct SpriteSheet spriteSheets[4];
+    struct SpritePalette spritePalettes[3];
+    struct SpriteTemplate spriteTemplate;
+
+    memcpy(spriteSheets, gUnknown_083E4628, sizeof(gUnknown_083E4628));
+    memcpy(spritePalettes, gUnknown_083E4648, sizeof(gUnknown_083E4648));
+    spriteTemplate = gSpriteTemplate_83E4660;
+    LoadSpriteSheets(spriteSheets);
+    LoadSpritePalettes(spritePalettes);
+
+    for (i = 0; i < gUnknown_083DFEC4->unk87DA - 1; i++)
+    {
+        spriteId = CreateSprite(&spriteTemplate, 226, i * 20 + 8, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId];
+            gUnknown_083DFEC4->unk87E4[i]->data[0] = i;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk87E4[i] = NULL;   
+        }
+    }
+
+    spriteTemplate.tileTag = 0x4;
+    spriteTemplate.callback = SpriteCallbackDummy;
+    for (; i < 6; i++)
+    {
+        spriteId = CreateSprite(&spriteTemplate, 230, i * 20 + 8, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId];
+            gUnknown_083DFEC4->unk87E4[i]->oam.size = 0;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk87E4[i] = NULL;
+        }
+    }
+
+    spriteTemplate.tileTag = 0x5;
+    spriteTemplate.callback = sub_80F3360;
+    spriteId = CreateSprite(&spriteTemplate, 222, i * 20 + 8, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gUnknown_083DFEC4->unk87E4[i] = &gSprites[spriteId];
+        gUnknown_083DFEC4->unk87E4[i]->oam.shape = ST_OAM_H_RECTANGLE;
+        gUnknown_083DFEC4->unk87E4[i]->oam.size = 2;
+    }
+    else
+    {
+        gUnknown_083DFEC4->unk87E4[i] = NULL;
+    }
+}
+
+void sub_80F357C(void)
+{
+    u16 i;
+
+    for (i = 0; i < 7; i++)
+    {
+        if (gUnknown_083DFEC4->unk87E4[i])
+        {
+            DestroySprite(gUnknown_083DFEC4->unk87E4[i]);
+            gUnknown_083DFEC4->unk87E4[i] = NULL;
+        }
+    }
+}
+
+static void sub_80F35B4(void)
+{
+    struct Sprite *sprite;
+
+    gUnknown_083DFEC4->unk76B0.baseTileTag = 0x1C;
+    gUnknown_083DFEC4->unk76B0.basePaletteTag = 0x13;
+    sub_80F727C(&gUnknown_083DFEC4->unk76B0);
+    sub_80F7404();
+    sprite = sub_80F7920(27, 21, gUnknown_083E4678);
+    sprite->oam.priority = 3;
+    sprite->pos1.x = 192;
+    sprite->pos1.y = 32;
+    sprite->callback = sub_80F363C;
+    gUnknown_083DFEC4->unk76AC = sprite;
+}
+
+void sub_80F3614(void)
+{
+    DestroySprite(gUnknown_083DFEC4->unk76AC);
+    FreeSpriteTilesByTag(0x1B);
+    FreeSpritePaletteByTag(0x15);
+}
+
+static void sub_80F363C(struct Sprite *sprite)
+{
+    StartSpriteAnim(sprite, gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9]);
+}
+
+void sub_80F3668(void)
+{
+    sub_80F7418(gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9], 176, 32);
+}
+
+void sub_80F3698(void)
+{
+    struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC];
+    gUnknown_083DFEC4->unk8934[gUnknown_083DFEC4->unk8fe9] = gUnknown_083DFEC4->unk76B0.markings;
+    SetMonMarkings(var0->unk1, var0->partyIdx, gUnknown_083DFEC4->unk76B0.markings);
+    sub_80F7470();
+}
+
+static void sub_80F36F0(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F3724());
+}
+
+static bool8 sub_80F3724(void)
+{
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        LZ77UnCompWram(gUnknown_083E3D00, gUnknown_083DFEC4->unk984C);
+        break;
+    case 1:
+        sub_80F379C();
+        gUnknown_083DFEC4->unk306++;
+        // fall through
+    case 2:
+        if (sub_80F37D0())
+            return TRUE;
+        break;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+
+static void sub_80F379C(void)
+{
+    gUnknown_083DFEC4->unkBC93 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F37D0());
+}
+
+static bool8 sub_80F37D0(void)
+{
+    u16 i;
+    u8 j, k, l, m;
+
+    if (gUnknown_083DFEC4->unkBC93 > 11)
+        return FALSE;
+
+    for (i = 0; i < 2; i++)
+    {
+        u8 *r4 = &gUnknown_083DFEC4->unk984C[gUnknown_083DFEC4->unkBC93][0];
+        u8 *r5 = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0];
+        for (j = 0; j < 4; j++)
+        {
+            CpuFastSet(r4, r5, 0x10);
+            r5 += 0x40;
+            r4 += 0x20;
+            for (k = 0; k < 2; k++)
+            {
+                for (l = 0; l < 8; l++)
+                {
+                    r4 += 4;
+                    for (m = 0; m < 4; m++)
+                    {
+                        r4 -= 1;
+                        *r5 = (*r4 << 4) | ((*r4 >> 4) & 0xF);
+                        r5++;
+                    }
+
+                    r4 += 4;
+                }
+
+                r4 -= 0x40;
+            }
+            
+            r4 += 0x60;
+        }
+
+        if (++gUnknown_083DFEC4->unkBC93 > 11)
+            return FALSE;
+    }
+
+    if (gUnknown_083DFEC4->unkBC93 > 11)
+        return FALSE;
+
+    return TRUE;
+}
+
+static void sub_80F38B8(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F38EC());
+}
+
+static bool8 sub_80F38EC(void)
+{
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        gUnknown_083DFEC4->unk9348 = NULL;
+        gUnknown_083DFEC4->unkBC92 = 0;
+        break;
+    case 1:
+        sub_80F2E18(0);
+        break;
+    case 2:
+        sub_80F3970();
+        gUnknown_083DFEC4->unk306++;
+        // fall through
+    case 3:
+        if (sub_80F39A4())
+            return TRUE;
+        break;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+
+static void sub_80F3970(void)
+{
+    gUnknown_083DFEC4->unkBC93 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F39A4());
+}
+
+static bool8 sub_80F39A4(void)
+{
+    struct SpriteSheet spriteSheet;
+    struct SpritePalette spritePalette;
+    if (gUnknown_083DFEC4->unkBC93 > 11)
+        return FALSE;
+
+    spriteSheet.data = &gUnknown_083DFEC4->unkA44C[gUnknown_083DFEC4->unkBC93][0];
+    spriteSheet.size = 0x200;
+    spriteSheet.tag = gUnknown_083DFEC4->unkBC93 + 11;
+    LoadSpriteSheet(&spriteSheet);
+    if (gUnknown_083DFEC4->unkBC93 < 5)
+    {
+        spritePalette.data = gUnknown_083E3C60[gUnknown_083DFEC4->unkBC93];
+        spritePalette.tag = gUnknown_083DFEC4->unkBC93 + 10;
+        LoadSpritePalette(&spritePalette);
+    }
+
+    if (++gUnknown_083DFEC4->unkBC93 > 11)
+        return FALSE;
+
+    return TRUE;
+}
+
+static struct Sprite *sub_80F3A3C(u16 arg0, u16 arg1)
+{
+    struct SpriteTemplate spriteTemplate;
+    u16 var0;
+    u8 ribbon;
+    u8 spriteId;
+
+    if (arg1 < 3)
+        var0 = arg0 + arg1 * 9;
+    else
+        var0 = arg0 + (gUnknown_083DFEC4->unkBC8E - gUnknown_083DFEC4->unkBC8F);
+
+    ribbon = gUnknown_083DFEC4->unkBC4C[var0];
+    spriteTemplate = gSpriteTemplate_83E476C;
+    spriteTemplate.tileTag = gPokenavRibbonsIconGfx[ribbon][0] + 11;
+    spriteTemplate.paletteTag = gPokenavRibbonsIconGfx[ribbon][1] + 10;
+    spriteId = CreateSprite(&spriteTemplate, arg0 * 16 + 96, arg1 * 16 + 40, 2);
+    if (spriteId != MAX_SPRITES)
+        return &gSprites[spriteId];
+    else
+        return NULL;
+}
+
+static void sub_80F3B00(void)
+{
+    gUnknown_083DFEC4->unk9348 = sub_80F3A3C(gUnknown_083DFEC4->unkBC90, gUnknown_083DFEC4->unkBC91);
+    if (gUnknown_083DFEC4->unk9348)
+    {
+        StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 1);
+        gUnknown_083DFEC4->unkBC92 = 1;
+    }
+    else
+    {
+        gUnknown_083DFEC4->unkBC92 = 0;
+    }
+}
+
+static bool8 sub_80F3B58(void)
+{
+    if (gUnknown_083DFEC4->unkBC92)
+    {
+        gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded;
+        return gUnknown_083DFEC4->unkBC92;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+static void sub_80F3B94(void)
+{
+    if (gUnknown_083DFEC4->unk9348)
+    {
+        StartSpriteAffineAnim(gUnknown_083DFEC4->unk9348, 2);
+        gUnknown_083DFEC4->unkBC92 = 1;
+    }
+    else
+    {
+        gUnknown_083DFEC4->unkBC92 = 0;
+    }
+}
+
+static bool8 sub_80F3BD4(void)
+{
+    if (gUnknown_083DFEC4->unkBC92)
+    {
+        gUnknown_083DFEC4->unkBC92 = !gUnknown_083DFEC4->unk9348->affineAnimEnded;
+        if (!gUnknown_083DFEC4->unkBC92)
+        {
+            FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum);
+            DestroySprite(gUnknown_083DFEC4->unk9348);
+            gUnknown_083DFEC4->unk9348 = NULL;
+        }
+
+        return gUnknown_083DFEC4->unkBC92;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+
+static void sub_80F3C2C(void)
+{
+    u16 i;
+
+    if (gUnknown_083DFEC4->unk9348)
+    {
+        FreeOamMatrix(gUnknown_083DFEC4->unk9348->oam.matrixNum);
+        DestroySprite(gUnknown_083DFEC4->unk9348);
+        gUnknown_083DFEC4->unk9348 = NULL;
+    }
+
+    for (i = 0; i < 12; i++)
+        FreeSpriteTilesByTag(i + 0xB);
+    
+    for (i = 0; i < 5; i++)
+        FreeSpritePaletteByTag(i + 0xA);
+    
+    sub_80F2F48();
+}
+
+void sub_80F3C94(void)
+{
+    u16 i;
+    struct SpriteSheet spriteSheet;
+    struct SpritePalette spritePalette;
+
+    spriteSheet = gUnknown_083E4784;
+    spritePalette = gUnknown_083E478C;
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&spritePalette);
+    for (i = 0; i < 10; i++)
+        gUnknown_083DFEC4->unk8800[i] = NULL;
+}
+
+void sub_80F3CE8(void)
+{
+    move_anim_execute();
+    FreeSpriteTilesByTag(0x17);
+    FreeSpritePaletteByTag(0xF);
+}
+
+void sub_80F3D00(void)
+{
+    u8 spriteId;
+    u16 i;
+    u8 var1;
+    struct UnkUsePokeblockSub *var0 = &gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC];
+
+    if (!var0->unk4)
+        return;
+
+    var1 = gUnknown_083DFEC4->unk8931[gUnknown_083DFEC4->unk8fe9];
+    for (i = 0; i < var1 + 1; i++)
+    {
+        spriteId = CreateSprite(&gSpriteTemplate_83E4800, 0, 0, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gUnknown_083DFEC4->unk8800[i] = &gSprites[spriteId];
+            gUnknown_083DFEC4->unk8800[i]->invisible = 1;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    sub_80F3F20(var1, 1);
+}
+
+void move_anim_execute(void)
+{
+    u16 i;
+
+    for (i = 0; i < 10; i++)
+    {
+        if (!gUnknown_083DFEC4->unk8800[i])
+            return;
+        
+        DestroySprite(gUnknown_083DFEC4->unk8800[i]);
+        gUnknown_083DFEC4->unk8800[i] = NULL;
+    }
+}
+
+void sub_80F3DDC(struct Sprite *sprite)
+{
+    if (++sprite->data[1] > 60)
+    {
+        sprite->data[1] = 0;
+        sub_80F3F20(sprite->data[2], 0);
+    }
+}
+
+static void sub_80F3E04(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        sprite->data[1] = 0;
+        sprite->callback = sub_80F3DDC;
+    }
+}
+
+static void sub_80F3E24(struct Sprite *sprite)
+{
+    if (gUnknown_083DFEC4->unk8768)
+    {
+        sprite->pos1.x = gUnknown_083DFEC4->unk8768->pos1.x
+                       + gUnknown_083DFEC4->unk8768->pos2.x
+                       + gUnknown_083E4794[sprite->data[0]][0];
+        sprite->pos1.y = gUnknown_083DFEC4->unk8768->pos1.y
+                       + gUnknown_083DFEC4->unk8768->pos2.y
+                       + gUnknown_083E4794[sprite->data[0]][1];
+    }
+    else
+    {
+        sprite->pos1.x = gUnknown_083E4794[sprite->data[0]][0] + 40;
+        sprite->pos1.y = gUnknown_083E4794[sprite->data[0]][1] + 104;
+    }
+}
+
+static void sub_80F3E9C(struct Sprite *sprite)
+{
+    if (sprite->data[1])
+    {
+        if (--sprite->data[1])
+            return;
+
+        SeekSpriteAnim(sprite, 0);
+        sprite->invisible = 0;
+    }
+
+    sub_80F3E24(sprite);
+    if (sprite->animEnded)
+    {
+        sprite->invisible = 1;
+        if (sprite->data[3] == sprite->data[2])
+        {
+            if (sprite->data[3] == 9)
+            {
+                sub_80F3FAC();
+                sprite->callback = sub_80F3E04;
+            }
+            else
+            {
+                sprite->callback = sub_80F3DDC;
+            }
+        }
+        else
+        {
+            sprite->callback = SpriteCallbackDummy;
+        }
+    }
+}
+
+static void sub_80F3F20(u8 arg0, u8 arg1)
+{
+    u16 i;
+
+    for (i = 0; i < 10; i++)
+    {
+        if (gUnknown_083DFEC4->unk8800[i])
+        {
+            gUnknown_083DFEC4->unk8800[i]->data[0] = i;
+            gUnknown_083DFEC4->unk8800[i]->data[1] = i * 16 + 1;
+            gUnknown_083DFEC4->unk8800[i]->data[2] = arg0;
+            gUnknown_083DFEC4->unk8800[i]->data[3] = i;
+
+            if (!arg1 || arg0 != 9)
+            {
+                gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E9C;
+            }
+            else
+            {
+                sub_80F3E24(gUnknown_083DFEC4->unk8800[i]);
+                sub_80F3FAC();
+                gUnknown_083DFEC4->unk8800[i]->callback = sub_80F3E04;
+                gUnknown_083DFEC4->unk8800[i]->invisible = 0;
+            }
+        }
+    }
+}
+
+static void sub_80F3FAC(void)
+{
+    u16 i;
+
+    for (i = 0; i < 10; i++)
+    {
+        if (gUnknown_083DFEC4->unk8800[i])
+        {
+            SeekSpriteAnim(gUnknown_083DFEC4->unk8800[i], 0);
+            gUnknown_083DFEC4->unk8800[i]->invisible = 0;
+        }
+    }
+}
+
+static void sub_80F3FF0(void)
+{
+    gUnknown_083DFEC4->unk306 = 0;
+    if (!gUnknown_083DFEC4->unk6DAC)
+        while (sub_80F4024());
+}
+
+static bool8 sub_80F4024(void)
+{
+    u8 paletteIndex;
+    u8 spriteId;
+    struct SpritePalette spritePalette;
+
+    switch (gUnknown_083DFEC4->unk306)
+    {
+    case 0:
+        LZ77UnCompWram(gUnknown_083E329C, gUnknown_083DFEC4->unk131E4);
+        break;
+    case 1:
+    {
+        struct SpriteSheet spriteSheet = {
+            .data = gUnknown_083DFEC4->unk131E4,
+            .size = sizeof(gUnknown_083DFEC4->unk131E4),
+            .tag = 0x18,
+        };
+        LoadSpriteSheet(&spriteSheet);
+        break;
+    }
+    case 2:
+        spritePalette = gUnknown_083E4818;
+        LoadSpritePalette(&spritePalette);
+        paletteIndex = IndexOfSpritePaletteTag(0x10);
+        gUnknown_083DFEC4->unk308 = -3 & ~(1 << (paletteIndex + 0x10));
+        break;
+    case 3:
+        spriteId = CreateSprite(&gSpriteTemplate_83E4850, 218, 14, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gUnknown_083DFEC4->unk6D98 = &gSprites[spriteId];
+            gUnknown_083DFEC4->unk6D98->data[0] = 0;
+        }
+        else
+        {
+            gUnknown_083DFEC4->unk6D98 = NULL;
+        }
+
+        gUnknown_083DFEC4->unk306++;
+        return FALSE;
+    default:
+        return FALSE;
+    }
+
+    gUnknown_083DFEC4->unk306++;
+    return TRUE;
+}
+
+void sub_80F4138(struct Sprite *sprite)
+{
+    sprite->pos2.y = -gUnknown_083DFEC4->unk030C;
+    if (sprite->pos2.y <= -32)
+    {
+        if (sprite->data[0] == 0)
+        {
+            sprite->invisible = 1;
+            sprite->data[0] = 1;
+        }
+    }
+    else
+    {
+        if (sprite->data[0] == 1)
+        {
+            sprite->invisible = 0;
+            sprite->data[0] = 0;
+        }
+    }
+}
+
+#ifdef NONMATCHING
+// close, but the last DmaCopy16 is sharing the 0x400 value from the beginning of the function.
+void sub_80F4194(u8 *arg0, u8 *text)
+{
+    u8 i;
+    u8 *tileBuffer;
+    u32 *tileBuf2;
+
+    tileBuffer = gUnknown_083DFEC8;
+    DmaFill16(3, 0x1111, tileBuffer, 0x280);
+    DmaFill16Defvars(3, 0x1111, 0x400 + tileBuffer, 0x280);
+    Text_InitWindow8004E3C(&gWindowTemplate_81E70F0, tileBuffer, text);
+
+    DmaClear16(3, tileBuffer + 0x220, 0x60);
+    DmaClear16(3, tileBuffer + 0x620, 0x60);
+
+    tileBuf2 = (int *)tileBuffer + 0x80;
+    tileBuf2[0] &= 0x0FFFFFFF;
+    tileBuf2[1] &= 0x0FFFFFFF;
+    tileBuf2[2] &= 0x0FFFFFFF;
+    tileBuf2[3] &= 0x0FFFFFFF;
+    tileBuf2[4] &= 0x0FFFFFFF;
+    tileBuf2[5] &= 0x0FFFFFFF;
+    tileBuf2[6] &= 0x0FFFFFFF;
+    tileBuf2[7] &= 0x0FFFFFFF;
+
+    tileBuf2 = (int *)tileBuffer + 0x180;
+    tileBuf2[0] &= 0x0FFFFFFF;
+    tileBuf2[1] &= 0x0FFFFFFF;
+    tileBuf2[2] &= 0x0FFFFFFF;
+    tileBuf2[3] &= 0x0FFFFFFF;
+    tileBuf2[4] &= 0x0FFFFFFF;
+    tileBuf2[5] &= 0x0FFFFFFF;
+    tileBuf2[6] &= 0x0FFFFFFF;
+    tileBuf2[7] &= 0x0FFFFFFF;
+
+    for (i = 0; i < 5; i++)
+    {
+        DmaCopy16(3, &tileBuffer[128 * i], &arg0[i * 256], 128);
+        DmaCopy16(3, &tileBuffer[128 * i + 0x400], &arg0[32 * ((i * 8) + 4)], 128);
+    }
+}
+#else
+NAKED
+void sub_80F4194(u8 *arg0, u8 *text)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    sub sp, 0x4\n\
+    adds r7, r0, 0\n\
+    adds r2, r1, 0\n\
+    ldr r0, _080F42A4 @ =gUnknown_083DFEC8\n\
+    ldr r6, [r0]      @ r6 = tileBuffer\n\
+    mov r0, sp        \n\
+    ldr r1, _080F42A8 @ =0x00001111\n\
+    adds r5, r1, 0\n\
+    strh r5, [r0]\n\
+    ldr r4, _080F42AC @ =0x040000d4\n\
+    str r0, [r4]\n\
+    str r6, [r4, 0x4]\n\
+    ldr r3, _080F42B0 @ =0x81000140\n\
+    str r3, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    movs r0, 0x80\n\
+    lsls r0, 3\n\
+    adds r1, r6, r0\n\
+    mov r0, sp\n\
+    strh r5, [r0]\n\
+    str r0, [r4]\n\
+    str r1, [r4, 0x4]\n\
+    str r3, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0\n\
+    adds r1, r6, 0\n\
+    bl Text_InitWindow8004E3C\n\
+    movs r3, 0x88\n\
+    lsls r3, 2\n\
+    adds r1, r6, r3\n\
+    mov r0, sp\n\
+    movs r3, 0\n\
+    strh r3, [r0]\n\
+    str r0, [r4]\n\
+    str r1, [r4, 0x4]\n\
+    ldr r2, _080F42B8 @ =0x81000030\n\
+    str r2, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    movs r0, 0xC4\n\
+    lsls r0, 3\n\
+    adds r1, r6, r0\n\
+    mov r0, sp\n\
+    strh r3, [r0]\n\
+    str r0, [r4]\n\
+    str r1, [r4, 0x4]\n\
+    str r2, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    movs r1, 0x80\n\
+    lsls r1, 2\n\
+    adds r2, r6, r1\n\
+    ldr r0, [r2]\n\
+    ldr r1, _080F42BC @ =0x0fffffff\n\
+    ands r0, r1\n\
+    str r0, [r2]\n\
+    ldr r0, [r2, 0x4]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x4]\n\
+    ldr r0, [r2, 0x8]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x8]\n\
+    ldr r0, [r2, 0xC]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0xC]\n\
+    ldr r0, [r2, 0x10]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x10]\n\
+    ldr r0, [r2, 0x14]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x14]\n\
+    ldr r0, [r2, 0x18]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x18]\n\
+    ldr r0, [r2, 0x1C]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x1C]\n\
+    movs r3, 0xC0\n\
+    lsls r3, 3\n\
+    adds r2, r6, r3\n\
+    ldr r0, [r2]\n\
+    ands r0, r1\n\
+    str r0, [r2]\n\
+    ldr r0, [r2, 0x4]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x4]\n\
+    ldr r0, [r2, 0x8]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x8]\n\
+    ldr r0, [r2, 0xC]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0xC]\n\
+    ldr r0, [r2, 0x10]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x10]\n\
+    ldr r0, [r2, 0x14]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x14]\n\
+    ldr r0, [r2, 0x18]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x18]\n\
+    ldr r0, [r2, 0x1C]\n\
+    ands r0, r1\n\
+    str r0, [r2, 0x1C]\n\
+    movs r1, 0\n\
+    ldr r2, _080F42C0 @ =0x80000040\n\
+_080F4268:\n\
+    lsls r0, r1, 7\n\
+    adds r0, r6, r0\n\
+    str r0, [r4]\n\
+    lsls r0, r1, 8\n\
+    adds r0, r7, r0\n\
+    str r0, [r4, 0x4]\n\
+    str r2, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    lsls r0, r1, 7\n\
+    movs r3, 0x80\n\
+    lsls r3, 3\n\
+    adds r0, r3\n\
+    adds r0, r6, r0\n\
+    str r0, [r4]\n\
+    lsls r0, r1, 3\n\
+    adds r0, 0x4\n\
+    lsls r0, 5\n\
+    adds r0, r7, r0\n\
+    str r0, [r4, 0x4]\n\
+    str r2, [r4, 0x8]\n\
+    ldr r0, [r4, 0x8]\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0x4\n\
+    bls _080F4268\n\
+    add sp, 0x4\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
+_080F42A4: .4byte gUnknown_083DFEC8\n\
+_080F42A8: .4byte 0x00001111\n\
+_080F42AC: .4byte 0x040000d4\n\
+_080F42B0: .4byte 0x81000140\n\
+_080F42B4: .4byte gWindowTemplate_81E70F0\n\
+_080F42B8: .4byte 0x81000030\n\
+_080F42BC: .4byte 0x0fffffff\n\
+_080F42C0: .4byte 0x80000040\n\
+    .syntax divided\n");
+}
+#endif // NONMATCHING
+
+static void sub_80F42C4(u8 *arg0)
+{
+    u16 i, tileOffset;
+    u8 spriteId;
+    struct SpriteSheet spriteSheet = {
+        .data = gUnknown_083DFEC4->unkD1E4[0],
+        .size = 0x500,
+        .tag = 0x1A,
+    };
+
+    sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0);
+    LoadSpriteSheet(&spriteSheet);
+    LoadSpritePalette(&gUnknown_083E4868);
+
+    tileOffset = 0;
+    for (i = 0; i < 5; i++)
+    {
+        spriteId = CreateSprite(&gSpriteTemplate_83E4878, i * 32 + 113, 16, 0);
+        if (spriteId != MAX_SPRITES)
+        {
+            gSprites[spriteId].oam.tileNum += tileOffset;
+            gUnknown_083DFEC4->unkCED4[i] = &gSprites[spriteId];
+        }
+        else
+        {
+            gUnknown_083DFEC4->unkCED4[i] = NULL;
+        }
+
+        tileOffset += 8;
+    }
+}
+
+static void sub_80F4394(void)
+{
+    u16 i;
+
+    for (i = 0; i < 5; i++)
+    {
+        if (gUnknown_083DFEC4->unkCED4[i])
+            DestroySprite(gUnknown_083DFEC4->unkCED4[i]);
+    }
+
+    FreeSpriteTilesByTag(0x1A);
+    FreeSpritePaletteByTag(0x12);
+}
+
+void sub_80F43D4(u8 *arg0)
+{
+    u16 tile;
+
+    sub_80F4194(gUnknown_083DFEC4->unkD1E4[0], arg0);
+    tile = GetSpriteTileStartByTag(0x1A);
+    if (tile != 0xFFFF)
+        DmaCopy32Defvars(3, gUnknown_083DFEC4->unkD1E4[0], (void *)(VRAM + 0x10000 + (tile * 32)), 0x500);
+}
+
+static u8 *sub_80F4428(u8 *arg0, u16 arg1, u8 arg2)
+{
+    return sub_80F6514(arg0, arg1, arg2);
+}
+
+static u8 *sub_80F443C(u8 *arg0, u16 arg1)
+{
+    return AlignInt1InMenuWindow(StringCopy(arg0, gOtherText_Number), arg1, 56, 1);
+}
+
+static u8 *sub_80F445C(u8 *arg0, u16 arg1)
+{
+    u8 *buffer = AlignInt1InMenuWindow(arg0, arg1, 23, 1);
+    buffer[0] = EXT_CTRL_CODE_BEGIN;
+    buffer[1] = 0x11;
+    buffer[2] = 1;
+    buffer += 3;
+    buffer[0] = CHAR_SLASH;
+    buffer += 1;
+    buffer[0] = EXT_CTRL_CODE_BEGIN;
+    buffer[1] = 0x11;
+    buffer[2] = 1;
+    buffer += 3;
+    buffer = AlignInt1InMenuWindow(buffer, gUnknown_083DFEC4->unk8774 + 1, 50, 1);
+    return buffer;
+}
+
+int sub_80F44B0(u16 box, u16 monIndex, int monDataField, int *text)
+{
+    if (box == 14)
+    {
+        if (monDataField == MON_DATA_NICKNAME || monDataField == MON_DATA_OT_NAME)
+            return GetMonData(&gPlayerParty[monIndex], monDataField, text);
+        else
+            return GetMonData(&gPlayerParty[monIndex], monDataField);
+    }
+    else
+    {
+        if (monDataField == MON_DATA_NICKNAME || monDataField == MON_DATA_OT_NAME)
+            return GetBoxMonData(&gPokemonStorage.boxes[box][monIndex], monDataField, text);
+        else
+            return GetBoxMonData(&gPokemonStorage.boxes[box][monIndex], monDataField);
+    }
+}
+
+static void SetMonMarkings(u16 box, u16 monIndex, u8 markings)
+{
+    if (box == 14)
+        SetMonData(&gPlayerParty[monIndex], MON_DATA_MARKINGS, &markings);
+    else
+        SetBoxMonData(&gPokemonStorage.boxes[box][monIndex], MON_DATA_MARKINGS, &markings);
+}
+
+void sub_80F45A0(s16 arg0, u8 arg1)
+{
+    u8 box;
+    u8 var0 = gUnknown_083DFEC4->unk893c[arg0].unk4;
+    if (var0)
+    {
+        sub_80F4428(gUnknown_083DFEC4->unk8829[arg1], arg0, 0);
+        box = gUnknown_083DFEC4->unk893c[arg0].unk1;
+        if (box == 14)
+            AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gOtherText_InParty, 64, 0);
+        else
+            AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gPokemonStorage.boxNames[box], 64, 0);
+
+        gUnknown_083DFEC4->unk8937[arg1] = 1;
+    }
+    else
+    {
+        AlignStringInMenuWindow(gUnknown_083DFEC4->unk8829[arg1], gEmptyString_81E72B0, 104, 0);
+        AlignStringInMenuWindow(gUnknown_083DFEC4->unk88E9[arg1], gEmptyString_81E72B0, 64, 0);
+        gUnknown_083DFEC4->unk8937[arg1] = var0;
+    }
+}
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 0eb13899e..374e73d2e 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -26,7 +26,7 @@
 #include "tv.h"
 #include "ewram.h"
 
-EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0};
+EWRAM_DATA struct RecordMixingDayCareMail gDayCareMailRecord = {0};
 extern u16 gSpecialVar_0x8005;
 
 u32 gUnknown_03005D2C;
@@ -36,11 +36,11 @@ static u8 gUnknown_0300071C[4];
 
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
-void *gUnknown_083D0274 = &gSaveBlock1.pokeNews;
-void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
+void *recordMixingPokeNews = &gSaveBlock1.pokeNews;
+void *recordMixingMauvilleMan = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
-struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
-void *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord;
+struct RecordMixingDayCareMail *gDayCareMailPlayerRecord = &gDayCareMailRecord;
+struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord;
 
 #define BUFFER_CHUNK_SIZE 200
 
@@ -51,30 +51,30 @@ void sub_80B929C(void)
 
 struct PlayerRecords
 {
-    struct SecretBaseRecord secretBases[20];
-    TVShow tvShows[25];
-    u8 filler1004[0x40];
-    u8 filler1044[0x40];
+    struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
+    TVShow tvShows[TV_SHOWS_COUNT];
+    struct PokeNews pokeNews[POKE_NEWS_COUNT];
+    union MauvilleMan mauvilleMan;
     struct EasyChatPair easyChatPairs[5];
-    struct RecordMixingDayCareMail filler10AC;
+    struct RecordMixingDayCareMail daycareMailRecord;
     struct BattleTowerRecord battleTowerRecord;
     u16 filler11C8[0x34];
 };
 
 void RecordMixing_PrepareExchangePacket(void)
 {
-    sub_80BC300();
+    SetPlayerSecretBaseRecordMixingParty();
     sub_80C045C();
 
     memcpy(ewram_2018000.secretBases, recordMixingSecretBases, sizeof(ewram_2018000.secretBases));
     memcpy(ewram_2018000.tvShows, recordMixingTvShows, sizeof(ewram_2018000.tvShows));
-    memcpy(ewram_2018000.filler1004, gUnknown_083D0274, sizeof(ewram_2008000.filler1004));
-    memcpy(ewram_2018000.filler1044, gUnknown_083D0278, sizeof(ewram_2008000.filler1044));
+    memcpy(ewram_2018000.pokeNews, recordMixingPokeNews, sizeof(ewram_2008000.pokeNews));
+    memcpy(&ewram_2018000.mauvilleMan, recordMixingMauvilleMan, sizeof(ewram_2008000.mauvilleMan));
     memcpy(ewram_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(ewram_2018000.easyChatPairs));
-    gUnknown_02038738.mail[0] = gSaveBlock1.daycare.misc.mail[0];
-    gUnknown_02038738.mail[1] = gSaveBlock1.daycare.misc.mail[1];
-    InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gUnknown_02038738);
-    memcpy(&ewram_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail));
+    gDayCareMailRecord.mail[0] = gSaveBlock1.daycare.misc.mail[0];
+    gDayCareMailRecord.mail[1] = gSaveBlock1.daycare.misc.mail[1];
+    InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gDayCareMailRecord);
+    memcpy(&ewram_2018000.daycareMailRecord, gDayCareMailPlayerRecord, sizeof(struct RecordMixingDayCareMail));
     memcpy(&ewram_2018000.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord));
 
     if (GetMultiplayerId() == 0)
@@ -85,10 +85,10 @@ void RecordMixing_ReceiveExchangePacket(u32 a)
 {
     sub_80BD674(ewram_2008000.secretBases, sizeof(struct PlayerRecords), a);
     sub_80BFD44((u8 *)ewram_2008000.tvShows, sizeof(struct PlayerRecords), a);
-    sub_80C0514(ewram_2008000.filler1004, sizeof(struct PlayerRecords), a);
-    sub_80B9B1C(ewram_2008000.filler1044, sizeof(struct PlayerRecords), a);
+    sub_80C0514(ewram_2008000.pokeNews, sizeof(struct PlayerRecords), a);
+    sub_80B9B1C((u8 *)&ewram_2008000.mauvilleMan, sizeof(struct PlayerRecords), a);
     sub_80FA4E4(ewram_2008000.easyChatPairs, sizeof(struct PlayerRecords), a);
-    sub_80B9C6C((u8 *)&ewram_2008000.filler10AC, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows);
+    sub_80B9C6C((u8 *)&ewram_2008000.daycareMailRecord, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows);
     sub_80B9B70(&ewram_2008000.battleTowerRecord, sizeof(struct PlayerRecords), a);
     sub_80B9F3C(ewram_2008000.filler11C8, a);
 }
@@ -439,7 +439,7 @@ void sub_80B9B1C(u8 *a, size_t size, u8 index)
 
     sub_80B9A88(arr);
     //Probably not how it was originally written, but this matches.
-    memcpy(a + index * size, (ptr = gUnknown_083D0278), 0x40);
+    memcpy(a + index * size, (ptr = recordMixingMauvilleMan), 0x40);
     memcpy(ptr, a + arr[index] * size, 0x40);
     sub_80F7F30();
 }
diff --git a/src/region_map.c b/src/region_map.c
index 74062f435..e9ae4599a 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -19,6 +19,8 @@
 #include "text.h"
 #include "trig.h"
 #include "ewram.h"
+#include "heal_location.h"
+#include "constants/heal_locations.h"
 
 #define MAP_WIDTH 28
 #define MAP_HEIGHT 15
@@ -1260,58 +1262,58 @@ static const u8 sFlyRegionMapFrame_TilemapLZ[] = INCBIN_U8("graphics/pokenav/map
 static const u16 sFlyTargetIcons_Pal[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
 static const u8 sFlyTargetIcons_ImageLZ[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
 
-static const u8 sUnknown_083E7920[][3] =
-{
-    {0,  9,  1},
-    {0, 10, 14},
-    {0, 11, 15},
-    {0, 12, 16},
-    {0, 13, 17},
-    {0, 14, 18},
-    {0, 15, 19},
-    {0,  0,  3},
-    {0,  1,  4},
-    {0,  2,  5},
-    {0,  3,  6},
-    {0,  4,  7},
-    {0,  5,  8},
-    {0,  6,  9},
-    {0,  7, 10},
-    {0,  8, 11},
-    {0, 16,  0},
-    {0, 17,  0},
-    {0, 18,  0},
-    {0, 19,  0},
-    {0, 20,  0},
-    {0, 21,  0},
-    {0, 22,  0},
-    {0, 23,  0},
-    {0, 24,  0},
-    {0, 25,  0},
-    {0, 26,  0},
-    {0, 27,  0},
-    {0, 28,  0},
-    {0, 29,  0},
-    {0, 30,  0},
-    {0, 31,  0},
-    {0, 32,  0},
-    {0, 33,  0},
-    {0, 34,  0},
-    {0, 35,  0},
-    {0, 36,  0},
-    {0, 37,  0},
-    {0, 38,  0},
-    {0, 39,  0},
-    {0, 40,  0},
-    {0, 41,  0},
-    {0, 42,  0},
-    {0, 43,  0},
-    {0, 44,  0},
-    {0, 45,  0},
-    {0, 46,  0},
-    {0, 47,  0},
-    {0, 48,  0},
-    {0, 49,  0},
+static const u8 sMapHealLocations[][3] =
+{
+    {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
+    {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
+    {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
+    {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), HEAL_LOCATION_LAVARIDGE_TOWN},
+    {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), HEAL_LOCATION_FALLARBOR_TOWN},
+    {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), HEAL_LOCATION_VERDANTURF_TOWN},
+    {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), HEAL_LOCATION_PACIFIDLOG_TOWN},
+    {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), HEAL_LOCATION_PETALBURG_CITY},
+    {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), HEAL_LOCATION_SLATEPORT_CITY},
+    {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), HEAL_LOCATION_MAUVILLE_CITY},
+    {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), HEAL_LOCATION_RUSTBORO_CITY},
+    {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), HEAL_LOCATION_FORTREE_CITY},
+    {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), HEAL_LOCATION_LILYCOVE_CITY},
+    {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), HEAL_LOCATION_MOSSDEEP_CITY},
+    {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), HEAL_LOCATION_SOOTOPOLIS_CITY},
+    {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), HEAL_LOCATION_EVER_GRANDE_CITY_1},
+    {MAP_GROUP(ROUTE101), MAP_NUM(ROUTE101), 0},
+    {MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), 0},
+    {MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), 0},
+    {MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), 0},
+    {MAP_GROUP(ROUTE105), MAP_NUM(ROUTE105), 0},
+    {MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), 0},
+    {MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), 0},
+    {MAP_GROUP(ROUTE108), MAP_NUM(ROUTE108), 0},
+    {MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), 0},
+    {MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), 0},
+    {MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), 0},
+    {MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), 0},
+    {MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), 0},
+    {MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), 0},
+    {MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), 0},
+    {MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), 0},
+    {MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), 0},
+    {MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), 0},
+    {MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), 0},
+    {MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), 0},
+    {MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), 0},
+    {MAP_GROUP(ROUTE122), MAP_NUM(ROUTE122), 0},
+    {MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), 0},
+    {MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), 0},
+    {MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), 0},
+    {MAP_GROUP(ROUTE126), MAP_NUM(ROUTE126), 0},
+    {MAP_GROUP(ROUTE127), MAP_NUM(ROUTE127), 0},
+    {MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), 0},
+    {MAP_GROUP(ROUTE129), MAP_NUM(ROUTE129), 0},
+    {MAP_GROUP(ROUTE130), MAP_NUM(ROUTE130), 0},
+    {MAP_GROUP(ROUTE131), MAP_NUM(ROUTE131), 0},
+    {MAP_GROUP(ROUTE132), MAP_NUM(ROUTE132), 0},
+    {MAP_GROUP(ROUTE133), MAP_NUM(ROUTE133), 0},
+    {MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0},
 };
 
 static const u8 *const sEverGrandeCityAreaNames[] =
@@ -1717,22 +1719,22 @@ void sub_80FC69C(void)
             switch (sFlyDataPtr->regionMap.mapSectionId)
             {
             case MAPSEC_SOUTHERN_ISLAND:
-                sub_8053538(22);
+                sub_8053538(HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR);
                 break;
             case MAPSEC_BATTLE_TOWER:
-                sub_8053538(21);
+                sub_8053538(HEAL_LOCATION_BATTLE_TOWER_OUTSIDE);
                 break;
             case MAPSEC_LITTLEROOT_TOWN:
-                sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
+                sub_8053538((gSaveBlock2.playerGender == MALE) ? HEAL_LOCATION_LITTLEROOT_TOWN_1 : HEAL_LOCATION_LITTLEROOT_TOWN_2);
                 break;
             case MAPSEC_EVER_GRANDE_CITY:
-                sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? 20 : 11);
+                sub_8053538((FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && sFlyDataPtr->regionMap.everGrandeCityArea == 0) ? HEAL_LOCATION_EVER_GRANDE_CITY_2 : HEAL_LOCATION_EVER_GRANDE_CITY_1);
                 break;
             default:
-                if (sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][2] != 0)
-                    sub_8053538(sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][2]);
+                if (sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2] != 0)
+                    sub_8053538(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][2]);
                 else
-                    warp1_set_2(sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][0], sUnknown_083E7920[sFlyDataPtr->regionMap.mapSectionId][1], -1);
+                    warp1_set_2(sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][0], sMapHealLocations[sFlyDataPtr->regionMap.mapSectionId][1], -1);
                 break;
             }
             sub_80865BC();
diff --git a/src/rom6.c b/src/rom6.c
index be14f1731..6efb1802e 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -13,7 +13,9 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
+#include "constants/map_types.h"
 
 extern u16 gSpecialVar_LastTalked;
 extern void (*gFieldCallback)(void);
diff --git a/src/secret_base.c b/src/secret_base.c
index 5bec7a06d..0892016d9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,10 +1,6 @@
 #include "global.h"
-#include "constants/decorations.h"
 #include "secret_base.h"
 #include "decoration.h"
-#include "constants/species.h"
-#include "constants/items.h"
-#include "constants/moves.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
@@ -29,11 +25,16 @@
 #include "overworld.h"
 #include "script.h"
 #include "sound.h"
-#include "constants/species.h"
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
 #include "text.h"
+#include "constants/bg_event_constants.h"
+#include "constants/decorations.h"
+#include "constants/items.h"
+#include "constants/map_types.h"
+#include "constants/moves.h"
+#include "constants/species.h"
 #include "constants/vars.h"
 
 
@@ -317,7 +318,7 @@ void sub_80BB970(struct MapEvents *events)
 
     for (bgevidx = 0; bgevidx < events->bgEventCount; bgevidx++)
     {
-        if (events->bgEvents[bgevidx].kind == 8)
+        if (events->bgEvents[bgevidx].kind == BG_EVENT_SECRET_BASE)
         {
             for (jdx = 0; jdx < MAX_SECRET_BASES; jdx++)
             {
@@ -538,7 +539,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *position, struct MapEv
 
     for (i = 0; i < events->bgEventCount; i++)
     {
-        if (events->bgEvents[i].kind == 8 && position->x == events->bgEvents[i].x + 7
+        if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && position->x == events->bgEvents[i].x + 7
          && position->y == events->bgEvents[i].y + 7)
         {
             gCurrentSecretBaseId = events->bgEvents[i].bgUnion.secretBaseId;
@@ -652,7 +653,7 @@ bool8 sub_80BC268(u8 i)
         return FALSE;
 }
 
-u8 sub_80BC298(struct Pokemon *mon)
+static u8 CalculateMonAverageEVs(struct Pokemon *mon)
 {
     u16 evsum = GetMonData(mon, MON_DATA_HP_EV);
     evsum += GetMonData(mon, MON_DATA_ATK_EV);
@@ -663,192 +664,37 @@ u8 sub_80BC298(struct Pokemon *mon)
     return (u8)(evsum / 6);
 }
 
-#ifdef NONMATCHING
-// So much is wrong with this function.
-// The compiler likes to store pointers in temp variables.  That's not what it's supposed to do.
-void sub_80BC300(void)
+void SetPlayerSecretBaseRecordMixingParty(void)
 {
-    u16 partyidx;
-    u16 moveidx;
-    u16 sbpartyidx = 0;
-    for (partyidx=0; partyidx<PARTY_SIZE; partyidx++)
+    u16 i;
+    u16 secretBasePartyIndex = 0;
+    struct SecretBaseRecord *record = &gSaveBlock1.secretBases[0];
+    for (i = 0; i < PARTY_SIZE; i++)
     {
-        for (moveidx=0; moveidx<4; moveidx++)
-            gSaveBlock1.secretBases[0].partyMoves[partyidx * 4 + moveidx] = MOVE_NONE;
-        gSaveBlock1.secretBases[0].partySpecies[partyidx] = SPECIES_NONE;
-        gSaveBlock1.secretBases[0].partyHeldItems[partyidx] = ITEM_NONE;
-        gSaveBlock1.secretBases[0].partyLevels[partyidx] = 0;
-        gSaveBlock1.secretBases[0].partyPersonality[partyidx] = 0;
-        gSaveBlock1.secretBases[0].partyEVs[partyidx] = 0;
-        if (GetMonData(&(gPlayerParty[partyidx]), MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&(gPlayerParty[partyidx]), MON_DATA_IS_EGG)) {
-            for (moveidx=0; moveidx<4; moveidx++)
-                gSaveBlock1.secretBases[0].partyMoves[sbpartyidx * 4 + moveidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_MOVE1 + moveidx);
-            gSaveBlock1.secretBases[0].partySpecies[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_SPECIES);
-            gSaveBlock1.secretBases[0].partyHeldItems[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_HELD_ITEM);
-            gSaveBlock1.secretBases[0].partyLevels[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_LEVEL);
-            gSaveBlock1.secretBases[0].partyPersonality[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_PERSONALITY);
-            gSaveBlock1.secretBases[0].partyEVs[sbpartyidx] = sub_80BC298(&(gPlayerParty[partyidx]));
-            sbpartyidx ++;
+        u16 j;
+        for (j = 0; j < 4; j++)
+            record->partyMoves[i * 4 + j] = MOVE_NONE;
+
+        record->partySpecies[i] = SPECIES_NONE;
+        record->partyHeldItems[i] = ITEM_NONE;
+        record->partyLevels[i] = 0;
+        record->partyPersonality[i] = 0;
+        record->partyEVs[i] = 0;
+
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+        {
+            for (j = 0; j < 4; j++)
+                record->partyMoves[secretBasePartyIndex * 4 + j] = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + j);
+
+            record->partySpecies[secretBasePartyIndex] = GetMonData(&(gPlayerParty[i]), MON_DATA_SPECIES);
+            record->partyHeldItems[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
+            record->partyLevels[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
+            record->partyPersonality[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
+            record->partyEVs[secretBasePartyIndex] = CalculateMonAverageEVs(&gPlayerParty[i]);
+            secretBasePartyIndex++;
         }
     }
 }
-#else
-NAKED
-void sub_80BC300(void)
-{
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r10\n\
-    mov r6, r9\n\
-    mov r5, r8\n\
-    push {r5-r7}\n\
-    sub sp, 0xC\n\
-    movs r0, 0\n\
-    mov r10, r0\n\
-    movs r6, 0\n\
-    mov r9, r6\n\
-_080BC314:\n\
-    movs r4, 0\n\
-    lsls r3, r6, 2\n\
-    lsls r2, r6, 1\n\
-    ldr r7, _080BC424 @ =gPlayerParty\n\
-    adds r1, r6, 0x1\n\
-    str r1, [sp]\n\
-    adds r1, r3, 0\n\
-_080BC322:\n\
-    adds r0, r1, r4\n\
-    lsls r0, 1\n\
-    ldr r5, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
-    adds r0, r5, r0\n\
-    mov r5, r9\n\
-    strh r5, [r0]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    cmp r4, 0x3\n\
-    bls _080BC322\n\
-    ldr r1, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
-    adds r0, r1, r2\n\
-    strh r5, [r0]\n\
-    ldr r5, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
-    adds r0, r5, r2\n\
-    mov r1, r9\n\
-    strh r1, [r0]\n\
-    ldr r2, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
-    adds r0, r2, r6\n\
-    mov r5, r9\n\
-    strb r5, [r0]\n\
-    ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
-    adds r0, r1, r3\n\
-    mov r2, r9\n\
-    str r2, [r0]\n\
-    ldr r3, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
-    adds r0, r3, r6\n\
-    strb r2, [r0]\n\
-    movs r0, 0x64\n\
-    adds r5, r6, 0\n\
-    muls r5, r0\n\
-    adds r4, r5, r7\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xB\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    beq _080BC408\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x2D\n\
-    bl GetMonData\n\
-    cmp r0, 0\n\
-    bne _080BC408\n\
-    movs r4, 0\n\
-    mov r0, r10\n\
-    lsls r0, 2\n\
-    mov r8, r0\n\
-    mov r1, r10\n\
-    lsls r7, r1, 1\n\
-    adds r1, 0x1\n\
-    str r1, [sp, 0x4]\n\
-    ldr r2, _080BC424 @ =gPlayerParty\n\
-_080BC38E:\n\
-    adds r1, r4, 0\n\
-    adds r1, 0xD\n\
-    adds r0, r5, r2\n\
-    str r2, [sp, 0x8]\n\
-    bl GetMonData\n\
-    mov r3, r8\n\
-    adds r1, r3, r4\n\
-    lsls r1, 1\n\
-    ldr r3, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
-    adds r1, r3, r1\n\
-    strh r0, [r1]\n\
-    adds r0, r4, 0x1\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    ldr r2, [sp, 0x8]\n\
-    cmp r4, 0x3\n\
-    bls _080BC38E\n\
-    movs r0, 0x64\n\
-    adds r4, r6, 0\n\
-    muls r4, r0\n\
-    ldr r0, _080BC424 @ =gPlayerParty\n\
-    adds r4, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xB\n\
-    bl GetMonData\n\
-    ldr r5, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
-    adds r1, r5, r7\n\
-    strh r0, [r1]\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xC\n\
-    bl GetMonData\n\
-    ldr r2, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
-    adds r1, r2, r7\n\
-    strh r0, [r1]\n\
-    adds r0, r4, 0\n\
-    movs r1, 0x38\n\
-    bl GetMonData\n\
-    ldr r1, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
-    add r1, r10\n\
-    strb r0, [r1]\n\
-    adds r0, r4, 0\n\
-    movs r1, 0\n\
-    bl GetMonData\n\
-    ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
-    add r1, r8\n\
-    str r0, [r1]\n\
-    adds r0, r4, 0\n\
-    bl sub_80BC298\n\
-    ldr r1, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
-    add r1, r10\n\
-    strb r0, [r1]\n\
-    ldr r3, [sp, 0x4]\n\
-    lsls r0, r3, 16\n\
-    lsrs r0, 16\n\
-    mov r10, r0\n\
-_080BC408:\n\
-    ldr r5, [sp]\n\
-    lsls r0, r5, 16\n\
-    lsrs r6, r0, 16\n\
-    cmp r6, 0x5\n\
-    bls _080BC314\n\
-    add sp, 0xC\n\
-    pop {r3-r5}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    mov r10, r5\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_080BC424: .4byte gPlayerParty\n\
-_080BC428: .4byte gSaveBlock1 + 0x1A54\n\
-_080BC42C: .4byte gSaveBlock1 + 0x1A84\n\
-_080BC430: .4byte gSaveBlock1 + 0x1A90\n\
-_080BC434: .4byte gSaveBlock1 + 0x1A9C\n\
-_080BC438: .4byte gSaveBlock1 + 0x1A3C\n\
-_080BC43C: .4byte gSaveBlock1 + 0x1AA2\n\
-.syntax divided\n");
-}
-#endif
 
 void sub_80BC440(void)
 {
@@ -871,7 +717,7 @@ void sub_80BC474(void)
 
     for (eventId = 0; eventId < mapEvents->bgEventCount; eventId++)
     {
-        if (mapEvents->bgEvents[eventId].kind == 8
+        if (mapEvents->bgEvents[eventId].kind == BG_EVENT_SECRET_BASE
          && gSaveBlock1.secretBases[0].secretBaseId == mapEvents->bgEvents[eventId].bgUnion.secretBaseId)
         {
             u16 i;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index dfbab1e3a..ee4cb6e0f 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -8,6 +8,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "util.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
 static bool8 CheckTrainer(u8);
diff --git a/src/tv.c b/src/tv.c
index fd6b7c62f..68694c058 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -432,7 +432,7 @@ void ClearTVShowData(void)
 {
     u8 showidx;
     u8 extradataidx;
-    for (showidx=0; showidx<25; showidx++) {
+    for (showidx=0; showidx<TV_SHOWS_COUNT; showidx++) {
         gSaveBlock1.tvShows[showidx].common.kind = 0;
         gSaveBlock1.tvShows[showidx].common.active = 0;
         for (extradataidx=0; extradataidx<34; extradataidx++) {
@@ -1341,7 +1341,7 @@ int sub_80BEBC8(struct PokeNews *pokeNews)
 {
     s8 i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
         if (pokeNews[i].kind == 0)
             return i;
@@ -1353,7 +1353,7 @@ void sub_80BEBF4(void)
 {
     u8 i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
         sub_80BEC10(i);
 }
 
@@ -1372,7 +1372,7 @@ void sub_80BEC40(void)
     {
         if (gSaveBlock1.pokeNews[i].kind == 0)
         {
-            for (j = i + 1; j < 16; j++)
+            for (j = i + 1; j < POKE_NEWS_COUNT; j++)
             {
                 if (gSaveBlock1.pokeNews[j].kind != 0)
                 {
@@ -1388,7 +1388,7 @@ void sub_80BEC40(void)
 u8 FindAnyTVNewsOnTheAir(void)
 {
     u8 i;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
         if (gSaveBlock1.pokeNews[i].kind != 0
          && gSaveBlock1.pokeNews[i].state == 1
@@ -1432,7 +1432,7 @@ bool8 GetPriceReduction(u8 arg0)
 
     if (arg0 == 0)
         return FALSE;
-    for (i=0; i<16; i++)
+    for (i=0; i<POKE_NEWS_COUNT; i++)
     {
         if (gSaveBlock1.pokeNews[i].kind == arg0)
         {
@@ -1475,7 +1475,7 @@ bool8 sub_80BEE48(u8 arg0)
 
     if (arg0 == 0)
         return TRUE;
-    for (i=0; i<16; i++)
+    for (i=0; i<POKE_NEWS_COUNT; i++)
     {
         if (gSaveBlock1.pokeNews[i].kind == arg0)
             return TRUE;
@@ -1487,7 +1487,7 @@ void sub_80BEE84(u16 var0)
 {
     u8 i;
 
-    for (i=0; i<16; i++)
+    for (i=0; i<POKE_NEWS_COUNT; i++)
     {
         if (gSaveBlock1.pokeNews[i].kind)
         {
@@ -2189,11 +2189,11 @@ void sub_80BFD20(void)
 
 typedef union ewramStruct_02007000
 {
-    TVShow tvshows[4][25];
-    struct PokeNews pokeNews[4][16];
+    TVShow tvshows[4][TV_SHOWS_COUNT];
+    struct PokeNews pokeNews[4][POKE_NEWS_COUNT];
 } ewramStruct_02007000;
 
-void sub_80BFE24(TVShow arg0[25], TVShow arg1[25], TVShow arg2[25], TVShow arg3[25]);
+void sub_80BFE24(TVShow arg0[TV_SHOWS_COUNT], TVShow arg1[TV_SHOWS_COUNT], TVShow arg2[TV_SHOWS_COUNT], TVShow arg3[TV_SHOWS_COUNT]);
 
 void sub_80C04A0(void);
 void sub_80C01D4(void);
@@ -2205,7 +2205,7 @@ void sub_80BFD44(u8 *arg0, u32 arg1, u8 arg2)
     ewramStruct_02007000 *ewramTVShows;
 
     for (i = 0; i < 4; i++)
-        memcpy(&gUnknown_02007000.tvshows[i], &arg0[i * arg1], 25 * sizeof(TVShow));
+        memcpy(&gUnknown_02007000.tvshows[i], &arg0[i * arg1], TV_SHOWS_COUNT * sizeof(TVShow));
     ewramTVShows = &gUnknown_02007000;
     switch (arg2)
     {
@@ -2230,12 +2230,12 @@ void sub_80BFD44(u8 *arg0, u32 arg1, u8 arg2)
 }
 
 s8 sub_80C019C(TVShow tvShows[]);
-bool8 sub_80BFF68(TVShow * tv1[25], TVShow * tv2[25], u8 idx);
+bool8 sub_80BFF68(TVShow * tv1[TV_SHOWS_COUNT], TVShow * tv2[TV_SHOWS_COUNT], u8 idx);
 u8 sub_80C004C(TVShow *tv1, TVShow *tv2, u8 idx);
 u8 sub_80C00B4(TVShow *tv1, TVShow *tv2, u8 idx);
 u8 sub_80C0134(TVShow *tv1, TVShow *tv2, u8 idx);
 
-void sub_80BFE24(TVShow arg0[25], TVShow arg1[25], TVShow arg2[25], TVShow arg3[25])
+void sub_80BFE24(TVShow arg0[TV_SHOWS_COUNT], TVShow arg1[TV_SHOWS_COUNT], TVShow arg2[TV_SHOWS_COUNT], TVShow arg3[TV_SHOWS_COUNT])
 {
     u8 i, j;
     TVShow **argslist[4];
@@ -2274,7 +2274,7 @@ void sub_80BFE24(TVShow arg0[25], TVShow arg1[25], TVShow arg2[25], TVShow arg3[
     }
 }
 
-bool8 sub_80BFF68(TVShow * arg1[25], TVShow * arg2[25], u8 idx)
+bool8 sub_80BFF68(TVShow * arg1[TV_SHOWS_COUNT], TVShow * arg2[TV_SHOWS_COUNT], u8 idx)
 {
     u8 value;
     u8 switchval;
@@ -2677,11 +2677,11 @@ void sub_80C04A0(void)
         sub_80BF55C(gSaveBlock1.tvShows, showIdx+5);
 }
 
-void sub_80C05C4(struct PokeNews[16], struct PokeNews[16], struct PokeNews[16], struct PokeNews[16]);
+void sub_80C05C4(struct PokeNews[POKE_NEWS_COUNT], struct PokeNews[POKE_NEWS_COUNT], struct PokeNews[POKE_NEWS_COUNT], struct PokeNews[POKE_NEWS_COUNT]);
 void sub_80C0750(void);
 void sub_80C0788(void);
-s8 sub_80C0730(struct PokeNews[16], u8);
-void sub_80C06BC(struct PokeNews *[16], struct PokeNews *[16]);
+s8 sub_80C0730(struct PokeNews[POKE_NEWS_COUNT], u8);
+void sub_80C06BC(struct PokeNews *[POKE_NEWS_COUNT], struct PokeNews *[POKE_NEWS_COUNT]);
 
 void sub_80C0514(void *a0, u32 a1, u8 a2)
 {
@@ -2710,7 +2710,7 @@ void sub_80C0514(void *a0, u32 a1, u8 a2)
     sub_80C0788();
 }
 
-void sub_80C05C4(struct PokeNews a0[16], struct PokeNews a1[16], struct PokeNews a2[16], struct PokeNews a3[16])
+void sub_80C05C4(struct PokeNews a0[POKE_NEWS_COUNT], struct PokeNews a1[POKE_NEWS_COUNT], struct PokeNews a2[POKE_NEWS_COUNT], struct PokeNews a3[POKE_NEWS_COUNT])
 {
     u8 i;
     u8 j;
@@ -2722,7 +2722,7 @@ void sub_80C05C4(struct PokeNews a0[16], struct PokeNews a1[16], struct PokeNews
     arglist[2] = &a2;
     arglist[3] = &a3;
     gUnknown_03000721 = GetLinkPlayerCount();
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
         for (j = 0; j < gUnknown_03000721; j++)
         {
@@ -2740,7 +2740,7 @@ void sub_80C05C4(struct PokeNews a0[16], struct PokeNews a1[16], struct PokeNews
     }
 }
 
-void sub_80C06BC(struct PokeNews *arg0[16], struct PokeNews *arg1[16])
+void sub_80C06BC(struct PokeNews *arg0[POKE_NEWS_COUNT], struct PokeNews *arg1[POKE_NEWS_COUNT])
 {
     struct PokeNews *str0;
     struct PokeNews *str1;
@@ -2757,7 +2757,7 @@ bool8 sub_80C06E8(struct PokeNews *arg0, struct PokeNews *arg1, s8 arg2)
 
     if (arg1->kind == 0)
         return FALSE;
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
         if (arg0[i].kind == arg1->kind)
             return FALSE;
@@ -2779,7 +2779,7 @@ void sub_80C0750(void)
 {
     u8 i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
         if (gSaveBlock1.pokeNews[i].kind > 3)
             sub_80BEC10(i);
@@ -2793,7 +2793,7 @@ void sub_80C0788(void)
 
     if (FlagGet(FLAG_SYS_GAME_CLEAR) != 1)
     {
-        for (i = 0; i < 16; i++)
+        for (i = 0; i < POKE_NEWS_COUNT; i++)
             gSaveBlock1.pokeNews[i].state = 0;
     }
 }
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index bdf6f4a44..dd28bd148 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -141,7 +141,7 @@ void sub_8136130(struct Pokeblock *pokeblock, MainCallback callback)
     gUnknown_02039304 = &gUnknown_083DFEC4->unkD164;
     gUnknown_02039304->pokeblock = pokeblock;
     gUnknown_02039304->callback = callback;
-    gUnknown_083DFEC4->unkD162[0] = 2;
+    gUnknown_083DFEC4->unkD162 = 2;
     launch_c3_walk_stairs_and_run_once(sub_8136294);
     SetMainCallback2(sub_8136244);
 }
@@ -152,7 +152,7 @@ static void sub_8136174(void)
     gUnknown_02039304->callback = gUnknown_02039308;
     gPokeblockMonID = sub_81370E4(gPokeblockMonID);
     gUnknown_02039304->unk56 = gPokeblockMonID < 4 ? 0 : 1;
-    gUnknown_083DFEC4->unkD162[0] = 2;
+    gUnknown_083DFEC4->unkD162 = 2;
     launch_c3_walk_stairs_and_run_once(sub_8136294);
     SetMainCallback2(sub_81361E4);
 }
@@ -243,7 +243,7 @@ static void sub_8136294(void)
         case 6:
             gUnknown_083DFEC4->unk76AA = 0;
             gUnknown_083DFEC4->unk87E0 = NULL;
-            gUnknown_083DFEC4->unk030C.val = 0x20;
+            gUnknown_083DFEC4->unk030C = 0x20;
             gUnknown_02039304->unk50++;
             break;
         case 7:
@@ -285,7 +285,7 @@ static void sub_8136294(void)
             break;
         case 13:
             sub_80F2E18(0);
-            gUnknown_083DFEC4->unk8768->unk26 = 0xffd8;
+            gUnknown_083DFEC4->unk8768->pos2.y = 0xffd8;
             gUnknown_02039304->unk50++;
             break;
         case 14: