change Sprite struct to use a data array instead of manual declares.

22 files changed, 1053 insertions, 1053 deletions

diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index 891ee48b8..c3845e48b 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -430,7 +430,7 @@ static void sub_81225D4(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0;
+        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data[0];
 
         DestroyTask(taskId);
         ewram1B000.unk262 = 1;
@@ -880,7 +880,7 @@ static void sub_8123034(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data0;
+        u8 r4 = gSprites[gTasks[taskId].data[3] >> 8].data[0];
 
         DestroyTask(taskId);
         ewram1B000.unk262 = 1;
diff --git a/src/field/decoration.c b/src/field/decoration.c
index bdeaaf91d..8e6276a2f 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -2439,11 +2439,11 @@ void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 * unk_0203
         sub_8100874(unk_02038900);
         sub_810070C(unk_02038900->palette, ((u16 *)gMapHeader.mapData->secondaryTileset->metatiles + 8 * unk_02038900->decoration->tiles[0])[7] >> 12);
         LoadSpritePalette(&gUnknown_083EC954);
-        gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0;
+        gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0];
         gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83EC93C, gUnknown_083EC900[unk_02038900->decoration->shape].x,  gUnknown_083EC900[unk_02038900->decoration->shape].y, 0);
     } else
     {
-        gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0;
+        gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0];
         gUnknown_03004880.unk4 = AddPseudoFieldObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x,  gUnknown_083EC900[unk_02038900->decoration->shape].y, 1);
         gSprites[gUnknown_03004880.unk4].oam.priority = 1;
     }
@@ -2520,8 +2520,8 @@ void sub_80FF960(u8 taskId)
 void sub_80FFAB0(u8 taskId)
 {
     gTasks[taskId].data[10] = 0;
-    gSprites[gUnknown_020391A8].data7 = 1;
-    gSprites[gUnknown_020391A9].data7 = 1;
+    gSprites[gUnknown_020391A8].data[7] = 1;
+    gSprites[gUnknown_020391A9].data[7] = 1;
     sub_810045C();
     sub_8100038(taskId);
 }
@@ -2529,8 +2529,8 @@ void sub_80FFAB0(u8 taskId)
 void sub_80FFB08(u8 taskId)
 {
     gTasks[taskId].data[10] = 0;
-    gSprites[gUnknown_020391A8].data7 = 1;
-    gSprites[gUnknown_020391A9].data7 = 1;
+    gSprites[gUnknown_020391A8].data[7] = 1;
+    gSprites[gUnknown_020391A9].data[7] = 1;
     sub_810045C();
     DisplayItemMessageOnField(taskId, gSecretBaseText_CancelDecorating, sub_8100248, 0);
 }
@@ -3400,13 +3400,13 @@ bool8 sub_8100430(void)
 void sub_810045C(void)
 {
     gUnknown_020391AA = 0;
-    gSprites[gUnknown_020391A8].data2 = 0;
-    gSprites[gUnknown_020391A8].data3 = 0;
+    gSprites[gUnknown_020391A8].data[2] = 0;
+    gSprites[gUnknown_020391A8].data[3] = 0;
 }
 
 void sub_8100494(u8 taskId)
 {
-    if (!gSprites[gUnknown_020391A8].data4)
+    if (!gSprites[gUnknown_020391A8].data[4])
     {
         if (gTasks[taskId].data[10] == 1)
         {
@@ -3420,29 +3420,29 @@ void sub_8100494(u8 taskId)
         if ((gMain.heldKeys & DPAD_ANY) == DPAD_UP)
         {
             gUnknown_020391AA = DIR_SOUTH;
-            gSprites[gUnknown_020391A8].data2 =  0;
-            gSprites[gUnknown_020391A8].data3 = -2;
+            gSprites[gUnknown_020391A8].data[2] =  0;
+            gSprites[gUnknown_020391A8].data[3] = -2;
             gTasks[taskId].data[1]--;
         }
         if ((gMain.heldKeys & DPAD_ANY) == DPAD_DOWN)
         {
             gUnknown_020391AA = DIR_NORTH;
-            gSprites[gUnknown_020391A8].data2 =  0;
-            gSprites[gUnknown_020391A8].data3 =  2;
+            gSprites[gUnknown_020391A8].data[2] =  0;
+            gSprites[gUnknown_020391A8].data[3] =  2;
             gTasks[taskId].data[1]++;
         }
         if ((gMain.heldKeys & DPAD_ANY) == DPAD_LEFT)
         {
             gUnknown_020391AA = DIR_WEST;
-            gSprites[gUnknown_020391A8].data2 = -2;
-            gSprites[gUnknown_020391A8].data3 =  0;
+            gSprites[gUnknown_020391A8].data[2] = -2;
+            gSprites[gUnknown_020391A8].data[3] =  0;
             gTasks[taskId].data[0]--;
         }
         if ((gMain.heldKeys & DPAD_ANY) == DPAD_RIGHT)
         {
             gUnknown_020391AA = DIR_EAST;
-            gSprites[gUnknown_020391A8].data2 =  2;
-            gSprites[gUnknown_020391A8].data3 =  0;
+            gSprites[gUnknown_020391A8].data[2] =  2;
+            gSprites[gUnknown_020391A8].data[3] =  0;
             gTasks[taskId].data[0]++;
         }
         if (!sub_8100430() || !sub_810038C(taskId))
@@ -3452,8 +3452,8 @@ void sub_8100494(u8 taskId)
     }
     if (gUnknown_020391AA)
     {
-        gSprites[gUnknown_020391A8].data4++;
-        gSprites[gUnknown_020391A8].data4 &= 7;
+        gSprites[gUnknown_020391A8].data[4]++;
+        gSprites[gUnknown_020391A8].data[4] &= 7;
     }
     if (!gTasks[taskId].data[10])
     {
@@ -3471,7 +3471,7 @@ void sub_8100494(u8 taskId)
 void sub_810065C(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0, 29, 19);
-    gSprites[gUnknown_020391A8].data7 = 0;
+    gSprites[gUnknown_020391A8].data[7] = 0;
     gTasks[taskId].data[10] = 0;
     gTasks[taskId].func = sub_8100494;
 }
@@ -3596,27 +3596,27 @@ void sub_8100930(u8 decoShape)
 
 void sub_81009A8(struct Sprite *sprite)
 {
-    sprite->data2 = 0;
-    sprite->data3 = 0;
-    sprite->data4 = 0;
-    sprite->data5 = 0;
-    sprite->data6 = 0;
-    sprite->data7 = 0;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
+    sprite->data[6] = 0;
+    sprite->data[7] = 0;
     sprite->callback = sub_81009C0;
 }
 
 void sub_81009C0(struct Sprite *sprite)
 {
-    if (sprite->data7 == 0)
+    if (sprite->data[7] == 0)
     {
-        if (sprite->data6 < 15)
+        if (sprite->data[6] < 15)
         {
             sprite->invisible = 0;
         } else
         {
             sprite->invisible = 1;
         }
-        sprite->data6 = (sprite->data6 + 1) & 0x1f;
+        sprite->data[6] = (sprite->data[6] + 1) & 0x1f;
     } else
     {
         sprite->invisible = 0;
@@ -3760,7 +3760,7 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void)
 {
     player_get_direction_lower_nybble();
     MenuZeroFillWindowRect(0, 0, 29, 19);
-    gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data0;
+    gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0];
     sub_81016C8();
     gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0);
     if (gSaveBlock2.playerGender == MALE)
@@ -3810,7 +3810,7 @@ void sub_8100E70(u8 taskId)
 void sub_8100EEC(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0, 29, 19);
-    gSprites[gUnknown_020391A8].data7 = 0;
+    gSprites[gUnknown_020391A8].data[7] = 0;
     gSprites[gUnknown_020391A8].invisible = 0;
     gSprites[gUnknown_020391A8].callback = sub_8101698;
     gSprites[gUnknown_020391A9].pos1.x = 0x88;
@@ -4198,8 +4198,8 @@ void sub_8101678(void)
 
 void sub_8101698(struct Sprite *sprite)
 {
-    sprite->data0 = (sprite->data0 + 1) & 0x1f;
-    if (sprite->data0 >= 16)
+    sprite->data[0] = (sprite->data[0] + 1) & 0x1f;
+    if (sprite->data[0] >= 16)
     {
         sprite->invisible = TRUE;
     } else
diff --git a/src/field/field_camera.c b/src/field/field_camera.c
index a29f4c49f..8384ad8d1 100644
--- a/src/field/field_camera.c
+++ b/src/field/field_camera.c
@@ -322,8 +322,8 @@ static void CameraUpdateCallback(struct CameraSomething *a)
 {
     if (a->unk4 != 0)
     {
-        a->unk8 = gSprites[a->unk4].data2;
-        a->unkC = gSprites[a->unk4].data3;
+        a->unk8 = gSprites[a->unk4].data[2];
+        a->unkC = gSprites[a->unk4].data[3];
     }
 }
 
diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index bd78fb632..e15dc906f 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -886,16 +886,16 @@ void PokecenterHealEffect_0(struct Task *task)
 
 void PokecenterHealEffect_1(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 1)
+    if (gSprites[task->data[6]].data[0] > 1)
     {
-        gSprites[task->data[7]].data0++;
+        gSprites[task->data[7]].data[0]++;
         task->data[0]++;
     }
 }
 
 void PokecenterHealEffect_2(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 4)
+    if (gSprites[task->data[6]].data[0] > 4)
     {
         task->data[0]++;
     }
@@ -903,7 +903,7 @@ void PokecenterHealEffect_2(struct Task *task)
 
 void PokecenterHealEffect_3(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 6)
+    if (gSprites[task->data[6]].data[0] > 6)
     {
         DestroySprite(&gSprites[task->data[6]]);
         FieldEffectActiveListRemove(FLDEFF_POKECENTER_HEAL);
@@ -949,7 +949,7 @@ void HallOfFameRecordEffect_0(struct Task *task)
 
 void HallOfFameRecordEffect_1(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 1)
+    if (gSprites[task->data[6]].data[0] > 1)
     {
         task->data[15]++; // was this ever initialized? is this ever used?
         task->data[0]++;
@@ -958,7 +958,7 @@ void HallOfFameRecordEffect_1(struct Task *task)
 
 void HallOfFameRecordEffect_2(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 4)
+    if (gSprites[task->data[6]].data[0] > 4)
     {
         task->data[0]++;
     }
@@ -966,7 +966,7 @@ void HallOfFameRecordEffect_2(struct Task *task)
 
 void HallOfFameRecordEffect_3(struct Task *task)
 {
-    if (gSprites[task->data[6]].data0 > 6)
+    if (gSprites[task->data[6]].data[0] > 6)
     {
         DestroySprite(&gSprites[task->data[6]]);
         FieldEffectActiveListRemove(FLDEFF_HALL_OF_FAME_RECORD);
@@ -984,46 +984,46 @@ u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5)
     sprite = &gSprites[spriteId];
     sprite->pos2.x = x;
     sprite->pos2.y = y;
-    sprite->data5 = data5;
-    sprite->data6 = data6;
-    sprite->data7 = spriteId;
+    sprite->data[5] = data5;
+    sprite->data[6] = data6;
+    sprite->data[7] = spriteId;
     return spriteId;
 }
 
 void SpriteCB_PokeballGlowEffect(struct Sprite *sprite)
 {
-    gUnknown_0839F288[sprite->data0](sprite);
+    gUnknown_0839F288[sprite->data[0]](sprite);
 }
 
 void PokeballGlowEffect_0(struct Sprite *sprite)
 {
     u8 endSpriteId;
-    if (sprite->data1 == 0 || (--sprite->data1) == 0)
+    if (sprite->data[1] == 0 || (--sprite->data[1]) == 0)
     {
-        sprite->data1 = 25;
-        endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data2].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data2].y + sprite->pos2.y, 0);
+        sprite->data[1] = 25;
+        endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data[2]].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data[2]].y + sprite->pos2.y, 0);
         gSprites[endSpriteId].oam.priority = 2;
-        gSprites[endSpriteId].data0 = sprite->data7;
-        sprite->data2++;
-        sprite->data6--;
+        gSprites[endSpriteId].data[0] = sprite->data[7];
+        sprite->data[2]++;
+        sprite->data[6]--;
         PlaySE(SE_BOWA);
     }
-    if (sprite->data6 == 0)
+    if (sprite->data[6] == 0)
     {
-        sprite->data1 = 32;
-        sprite->data0++;
+        sprite->data[1] = 32;
+        sprite->data[0]++;
     }
 }
 
 void PokeballGlowEffect_1(struct Sprite *sprite)
 {
-    if ((--sprite->data1) == 0)
+    if ((--sprite->data[1]) == 0)
     {
-        sprite->data0++;
-        sprite->data1 = 8;
-        sprite->data2 = 0;
-        sprite->data3 = 0;
-        if (sprite->data5)
+        sprite->data[0]++;
+        sprite->data[1] = 8;
+        sprite->data[2] = 0;
+        sprite->data[3] = 0;
+        if (sprite->data[5])
         {
             PlayFanfare(BGM_ME_ASA);
         }
@@ -1033,48 +1033,48 @@ void PokeballGlowEffect_1(struct Sprite *sprite)
 void PokeballGlowEffect_2(struct Sprite *sprite)
 {
     u8 phase;
-    if ((--sprite->data1) == 0)
+    if ((--sprite->data[1]) == 0)
     {
-        sprite->data1 = 8;
-        sprite->data2++;
-        sprite->data2 &= 3;
-        if (sprite->data2 == 0)
+        sprite->data[1] = 8;
+        sprite->data[2]++;
+        sprite->data[2] &= 3;
+        if (sprite->data[2] == 0)
         {
-            sprite->data3++;
+            sprite->data[3]++;
         }
     }
-    phase = (sprite->data2 + 3) & 3;
+    phase = (sprite->data[2] + 3) & 3;
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
-    phase = (sprite->data2 + 2) & 3;
+    phase = (sprite->data[2] + 2) & 3;
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
-    phase = (sprite->data2 + 1) & 3;
+    phase = (sprite->data[2] + 1) & 3;
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
-    phase = sprite->data2;
+    phase = sprite->data[2];
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
-    if (sprite->data3 > 2)
+    if (sprite->data[3] > 2)
     {
-        sprite->data0++;
-        sprite->data1 = 8;
-        sprite->data2 = 0;
+        sprite->data[0]++;
+        sprite->data[1] = 8;
+        sprite->data[2] = 0;
     }
 }
 
 void PokeballGlowEffect_3(struct Sprite *sprite)
 {
     u8 phase;
-    if ((--sprite->data1) == 0)
+    if ((--sprite->data[1]) == 0)
     {
-        sprite->data1 = 8;
-        sprite->data2++;
-        sprite->data2 &= 3;
-        if (sprite->data2 == 3)
+        sprite->data[1] = 8;
+        sprite->data[2]++;
+        sprite->data[2] &= 3;
+        if (sprite->data[2] == 3)
         {
-            sprite->data0++;
-            sprite->data1 = 30;
+            sprite->data[0]++;
+            sprite->data[1] = 30;
         }
     }
-    phase = sprite->data2;
+    phase = sprite->data[2];
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
     MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
@@ -1084,22 +1084,22 @@ void PokeballGlowEffect_3(struct Sprite *sprite)
 
 void PokeballGlowEffect_4(struct Sprite *sprite)
 {
-    if ((--sprite->data1) == 0)
+    if ((--sprite->data[1]) == 0)
     {
-        sprite->data0++;
+        sprite->data[0]++;
     }
 }
 
 void PokeballGlowEffect_5(struct Sprite *sprite)
 {
-    sprite->data0++;
+    sprite->data[0]++;
 }
 
 void PokeballGlowEffect_6(struct Sprite *sprite)
 {
-    if (sprite->data5 == 0 || IsFanfareTaskInactive())
+    if (sprite->data[5] == 0 || IsFanfareTaskInactive())
     {
-        sprite->data0++;
+        sprite->data[0]++;
     }
 }
 
@@ -1109,7 +1109,7 @@ void PokeballGlowEffect_7(struct Sprite *sprite)
 
 void SpriteCB_PokeballGlow(struct Sprite *sprite)
 {
-    if (gSprites[sprite->data0].data0 > 4)
+    if (gSprites[sprite->data[0]].data[0] > 4)
     {
         FieldEffectFreeGraphicsResources(sprite);
     }
@@ -1129,9 +1129,9 @@ u8 PokecenterHealEffectHelper(s16 x, s16 y)
 
 void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
 {
-    if (sprite->data0 != 0)
+    if (sprite->data[0] != 0)
     {
-        sprite->data0 = 0;
+        sprite->data[0] = 0;
         sprite->invisible = 0;
         StartSpriteAnim(sprite, 1);
     }
@@ -1153,21 +1153,21 @@ void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
         spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0);
     }
     gSprites[spriteIdAtEnd].invisible = 1;
-    gSprites[spriteIdAtEnd].data0 = a0;
+    gSprites[spriteIdAtEnd].data[0] = a0;
 }
 
 void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data0].data[15])
+    if (gTasks[sprite->data[0]].data[15])
     {
-        if (sprite->data1 == 0 || (--sprite->data1) == 0)
+        if (sprite->data[1] == 0 || (--sprite->data[1]) == 0)
         {
-            sprite->data1 = 16;
+            sprite->data[1] = 16;
             sprite->invisible ^= 1;
         }
-        sprite->data2++;
+        sprite->data[2]++;
     }
-    if (sprite->data2 > 127)
+    if (sprite->data[2] > 127)
     {
         FieldEffectFreeGraphicsResources(sprite);
     }
@@ -2480,7 +2480,7 @@ void sub_8088228(struct Task *task)
 void sub_80882B4(struct Task *task)
 {
     task->data[5] -= 16;
-    if (gSprites[task->data[15]].data7)
+    if (gSprites[task->data[15]].data[7])
     {
         task->data[0]++;
     }
@@ -2607,7 +2607,7 @@ void sub_8088554(struct Task *task)
 void sub_80885A8(struct Task *task)
 {
     sub_80886F8(task);
-    if (gSprites[task->data[15]].data7)
+    if (gSprites[task->data[15]].data[7])
     {
         task->data[0]++;
     }
@@ -2827,8 +2827,8 @@ u8 sub_8088830(u32 a0, u32 a1, u32 a2)
     sprite = &gSprites[monSprite];
     sprite->callback = SpriteCallbackDummy;
     sprite->oam.priority = 0;
-    sprite->data0 = a0;
-    sprite->data6 = v0;
+    sprite->data[0] = a0;
+    sprite->data[6] = v0;
     return monSprite;
 }
 
@@ -2839,14 +2839,14 @@ void sub_8088890(struct Sprite *sprite)
     if ((sprite->pos1.x -= 20) <= 0x78)
     {
         sprite->pos1.x = 0x78;
-        sprite->data1 = 30;
+        sprite->data[1] = 30;
         sprite->callback = sub_80888D4;
-        if (sprite->data6)
+        if (sprite->data[6])
         {
-            PlayCry2(sprite->data0, 0, 0x7d, 0xa);
+            PlayCry2(sprite->data[0], 0, 0x7d, 0xa);
         } else
         {
-            PlayCry1(sprite->data0, 0);
+            PlayCry1(sprite->data[0], 0);
         }
     }
 }
@@ -2855,7 +2855,7 @@ void sub_80888F0(struct Sprite *);
 
 void sub_80888D4(struct Sprite *sprite)
 {
-    if ((--sprite->data1) == 0)
+    if ((--sprite->data[1]) == 0)
     {
         sprite->callback = sub_80888F0;
     }
@@ -2865,7 +2865,7 @@ void sub_80888F0(struct Sprite *sprite)
 {
     if (sprite->pos1.x < -0x40)
     {
-        sprite->data7 = 1;
+        sprite->data[7] = 1;
     } else
     {
         sprite->pos1.x -= 20;
@@ -2969,7 +2969,7 @@ u8 FldEff_NPCFlyOut(void)
     sprite->oam.paletteNum = 0;
     sprite->oam.priority = 1;
     sprite->callback = sub_8088BC4;
-    sprite->data1 = gFieldEffectArguments[0];
+    sprite->data[1] = gFieldEffectArguments[0];
     PlaySE(SE_W019);
     return spriteId;
 }
@@ -2977,19 +2977,19 @@ u8 FldEff_NPCFlyOut(void)
 void sub_8088BC4(struct Sprite *sprite)
 {
     struct Sprite *npcSprite;
-    sprite->pos2.x = Cos(sprite->data2, 0x8c);
-    sprite->pos2.y = Sin(sprite->data2, 0x48);
-    sprite->data2 = (sprite->data2 + 4) & 0xff;
-    if (sprite->data0)
+    sprite->pos2.x = Cos(sprite->data[2], 0x8c);
+    sprite->pos2.y = Sin(sprite->data[2], 0x48);
+    sprite->data[2] = (sprite->data[2] + 4) & 0xff;
+    if (sprite->data[0])
     {
-        npcSprite = &gSprites[sprite->data1];
+        npcSprite = &gSprites[sprite->data[1]];
         npcSprite->coordOffsetEnabled = 0;
         npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x;
         npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
         npcSprite->pos2.x = 0;
         npcSprite->pos2.y = 0;
     }
-    if (sprite->data2 >= 0x80)
+    if (sprite->data[2] >= 0x80)
     {
         FieldEffectStop(sprite, FLDEFF_NPCFLY_OUT);
     }
@@ -3149,7 +3149,7 @@ u8 sub_8088F60(void)
 
 u8 sub_8088FA4(u8 spriteId)
 {
-    return gSprites[spriteId].data7;
+    return gSprites[spriteId].data[7];
 }
 
 void sub_8088FC0(u8 spriteId)
@@ -3161,20 +3161,20 @@ void sub_8088FC0(u8 spriteId)
     sprite->pos1.y = 0x00;
     sprite->pos2.x = 0;
     sprite->pos2.y = 0;
-    memset(&sprite->data0, 0, 8 * sizeof(u16) /* zero all data cells */);
-    sprite->data6 = 0x40;
+    memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */);
+    sprite->data[6] = 0x40;
 }
 
 void sub_8088FFC(u8 a0, u8 a1)
 {
-    gSprites[a0].data6 = a1;
+    gSprites[a0].data[6] = a1;
 }
 
 void sub_8089018(struct Sprite *sprite)
 {
-    if (sprite->data7 == 0)
+    if (sprite->data[7] == 0)
     {
-        if (sprite->data0 == 0)
+        if (sprite->data[0] == 0)
         {
             sprite->oam.affineMode = 3;
             sprite->affineAnims = gSpriteAffineAnimTable_0839F44C;
@@ -3182,20 +3182,20 @@ void sub_8089018(struct Sprite *sprite)
             StartSpriteAffineAnim(sprite, 0);
             sprite->pos1.x = 0x76;
             sprite->pos1.y = -0x30;
-            sprite->data0++;
-            sprite->data1 = 0x40;
-            sprite->data2 = 0x100;
+            sprite->data[0]++;
+            sprite->data[1] = 0x40;
+            sprite->data[2] = 0x100;
         }
-        sprite->data1 += (sprite->data2 >> 8);
-        sprite->pos2.x = Cos(sprite->data1, 0x78);
-        sprite->pos2.y = Sin(sprite->data1, 0x78);
-        if (sprite->data2 < 0x800)
+        sprite->data[1] += (sprite->data[2] >> 8);
+        sprite->pos2.x = Cos(sprite->data[1], 0x78);
+        sprite->pos2.y = Sin(sprite->data[1], 0x78);
+        if (sprite->data[2] < 0x800)
         {
-            sprite->data2 += 0x60;
+            sprite->data[2] += 0x60;
         }
-        if (sprite->data1 > 0x81)
+        if (sprite->data[1] > 0x81)
         {
-            sprite->data7++;
+            sprite->data[7]++;
             sprite->oam.affineMode = 0;
             FreeOamMatrix(sprite->oam.matrixNum);
             CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0);
@@ -3206,29 +3206,29 @@ void sub_8089018(struct Sprite *sprite)
 void sub_80890D8(struct Sprite *sprite)
 {
     struct Sprite *sprite1;
-    sprite->pos2.x = Cos(sprite->data2, 0x8c);
-    sprite->pos2.y = Sin(sprite->data2, 0x48);
-    sprite->data2 = (sprite->data2 + 4) & 0xff;
-    if (sprite->data6 != 0x40)
+    sprite->pos2.x = Cos(sprite->data[2], 0x8c);
+    sprite->pos2.y = Sin(sprite->data[2], 0x48);
+    sprite->data[2] = (sprite->data[2] + 4) & 0xff;
+    if (sprite->data[6] != 0x40)
     {
-        sprite1 = &gSprites[sprite->data6];
+        sprite1 = &gSprites[sprite->data[6]];
         sprite1->coordOffsetEnabled = 0;
         sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x;
         sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
         sprite1->pos2.x = 0;
         sprite1->pos2.y = 0;
     }
-    if (sprite->data2 >= 0x80)
+    if (sprite->data[2] >= 0x80)
     {
-        sprite->data7 = 1;
+        sprite->data[7] = 1;
     }
 }
 
 void sub_808914C(struct Sprite *sprite)
 {
-    if (sprite->data7 == 0)
+    if (sprite->data[7] == 0)
     {
-        if (sprite->data0 == 0)
+        if (sprite->data[0] == 0)
         {
             sprite->oam.affineMode = 3;
             sprite->affineAnims = gSpriteAffineAnimTable_0839F44C;
@@ -3236,31 +3236,31 @@ void sub_808914C(struct Sprite *sprite)
             StartSpriteAffineAnim(sprite, 1);
             sprite->pos1.x = 0x5e;
             sprite->pos1.y = -0x20;
-            sprite->data0++;
-            sprite->data1 = 0xf0;
-            sprite->data2 = 0x800;
-            sprite->data4 = 0x80;
+            sprite->data[0]++;
+            sprite->data[1] = 0xf0;
+            sprite->data[2] = 0x800;
+            sprite->data[4] = 0x80;
         }
-        sprite->data1 += sprite->data2 >> 8;
-        sprite->data3 += sprite->data2 >> 8;
-        sprite->data1 &= 0xff;
-        sprite->pos2.x = Cos(sprite->data1, 0x20);
-        sprite->pos2.y = Sin(sprite->data1, 0x78);
-        if (sprite->data2 > 0x100)
+        sprite->data[1] += sprite->data[2] >> 8;
+        sprite->data[3] += sprite->data[2] >> 8;
+        sprite->data[1] &= 0xff;
+        sprite->pos2.x = Cos(sprite->data[1], 0x20);
+        sprite->pos2.y = Sin(sprite->data[1], 0x78);
+        if (sprite->data[2] > 0x100)
         {
-            sprite->data2 -= sprite->data4;
+            sprite->data[2] -= sprite->data[4];
         }
-        if (sprite->data4 < 0x100)
+        if (sprite->data[4] < 0x100)
         {
-            sprite->data4 += 24;
+            sprite->data[4] += 24;
         }
-        if (sprite->data2 < 0x100)
+        if (sprite->data[2] < 0x100)
         {
-            sprite->data2 = 0x100;
+            sprite->data[2] = 0x100;
         }
-        if (sprite->data3 >= 60)
+        if (sprite->data[3] >= 60)
         {
-            sprite->data7++;
+            sprite->data[7]++;
             sprite->oam.affineMode = 0;
             FreeOamMatrix(sprite->oam.matrixNum);
             sprite->invisible = 1;
diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c
index 2ad8bdce3..c5b67fd9d 100644
--- a/src/field/field_effect_helpers.c
+++ b/src/field/field_effect_helpers.c
@@ -89,9 +89,9 @@ void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 f
     newSprite->affineAnims = gDummySpriteAffineAnimTable;
     newSprite->affineAnimBeginning = TRUE;
     newSprite->subspriteMode = 0;
-    newSprite->data0 = sprite->data0;
-    newSprite->data1 = mapObject->localId;
-    newSprite->data7 = flag;
+    newSprite->data[0] = sprite->data[0];
+    newSprite->data[1] = mapObject->localId;
+    newSprite->data[7] = flag;
     npc_pal_op(mapObject, newSprite);
     if (!flag)
     {
@@ -110,10 +110,10 @@ static void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite)
     u16 unk_8041e2c[ARRAY_COUNT(gUnknown_08401E2C)];
 
     memcpy(unk_8041e2c, gUnknown_08401E2C, sizeof gUnknown_08401E2C);
-    sprite->data2 = 0;
+    sprite->data[2] = 0;
     if (!GetFieldObjectGraphicsInfo(mapObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(mapObject->mapobj_unk_1F)) || (whichElement = sub_8057450(mapObject->mapobj_unk_1E))))
     {
-        sprite->data2 = unk_8041e2c[whichElement - 1];
+        sprite->data[2] = unk_8041e2c[whichElement - 1];
         npc_pal_op_A(mapObject, sprite->oam.paletteNum);
     }
     else
@@ -162,9 +162,9 @@ static void sub_81269E0(struct Sprite *sprite)
     struct MapObject *mapObject;
     struct Sprite *oldSprite;
 
-    mapObject = &gMapObjects[sprite->data0];
+    mapObject = &gMapObjects[sprite->data[0]];
     oldSprite = &gSprites[mapObject->spriteId];
-    if (!mapObject->active || !mapObject->mapobj_bit_17 || mapObject->localId != sprite->data1)
+    if (!mapObject->active || !mapObject->mapobj_bit_17 || mapObject->localId != sprite->data[1])
     {
         sprite->inUse = FALSE;
     }
@@ -179,13 +179,13 @@ static void sub_81269E0(struct Sprite *sprite)
         sprite->subspriteTableNum = oldSprite->subspriteTableNum;
         sprite->invisible = oldSprite->invisible;
         sprite->pos1.x = oldSprite->pos1.x;
-        sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(mapObject) + sprite->data2;
+        sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(mapObject) + sprite->data[2];
         sprite->centerToCornerVecX = oldSprite->centerToCornerVecX;
         sprite->centerToCornerVecY = oldSprite->centerToCornerVecY;
         sprite->pos2.x = oldSprite->pos2.x;
         sprite->pos2.y = -oldSprite->pos2.y;
         sprite->coordOffsetEnabled = oldSprite->coordOffsetEnabled;
-        if (sprite->data7 == FALSE)
+        if (sprite->data[7] == FALSE)
         {
             sprite->oam.matrixNum = 0;
             if (oldSprite->oam.matrixNum & 0x8)
@@ -224,15 +224,15 @@ void sub_8126BC4(u8 spriteId, u8 animNum, s16 x, s16 y)
     struct Sprite *sprite;
 
     sprite = &gSprites[spriteId];
-    if (sprite->invisible || sprite->data0 != x || sprite->data1 != y)
+    if (sprite->invisible || sprite->data[0] != x || sprite->data[1] != y)
     {
         sub_80603CC(x, y, &x2, &y2);
         sprite = &gSprites[spriteId];
         sprite->pos1.x = x2 + 8;
         sprite->pos1.y = y2 + 8;
         sprite->invisible = FALSE;
-        sprite->data0 = x;
-        sprite->data1 = y;
+        sprite->data[0] = x;
+        sprite->data[1] = y;
         StartSpriteAnim(sprite, animNum - 1);
     }
 }
@@ -249,10 +249,10 @@ u32 FldEff_Shadow(void)
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].coordOffsetEnabled = TRUE;
-        gSprites[spriteId].data0 = gFieldEffectArguments[0];
-        gSprites[spriteId].data1 = gFieldEffectArguments[1];
-        gSprites[spriteId].data2 = gFieldEffectArguments[2];
-        gSprites[spriteId].data3 = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize];
+        gSprites[spriteId].data[0] = gFieldEffectArguments[0];
+        gSprites[spriteId].data[1] = gFieldEffectArguments[1];
+        gSprites[spriteId].data[2] = gFieldEffectArguments[2];
+        gSprites[spriteId].data[3] = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize];
     }
     return 0;
 }
@@ -263,7 +263,7 @@ void oamc_shadow(struct Sprite *sprite)
     struct MapObject *mapObject;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId))
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId))
     {
         FieldEffectStop(sprite, FLDEFF_SHADOW);
     }
@@ -273,7 +273,7 @@ void oamc_shadow(struct Sprite *sprite)
         linkedSprite = &gSprites[mapObject->spriteId];
         sprite->oam.priority = linkedSprite->oam.priority;
         sprite->pos1.x = linkedSprite->pos1.x;
-        sprite->pos1.y = linkedSprite->pos1.y + sprite->data3;
+        sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3];
         if (!mapObject->active || !mapObject->mapobj_bit_22 || MetatileBehavior_IsPokeGrass(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1F) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1E) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1F))
         {
             FieldEffectStop(sprite, FLDEFF_SHADOW);
@@ -297,12 +297,12 @@ u32 FldEff_TallGrass(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = gFieldEffectArguments[0];
-        sprite->data2 = gFieldEffectArguments[1];
-        sprite->data3 = gFieldEffectArguments[4];
-        sprite->data4 = gFieldEffectArguments[5];
-        sprite->data5 = gFieldEffectArguments[6];
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = gFieldEffectArguments[0];
+        sprite->data[2] = gFieldEffectArguments[1];
+        sprite->data[3] = gFieldEffectArguments[4];
+        sprite->data[4] = gFieldEffectArguments[5];
+        sprite->data[5] = gFieldEffectArguments[6];
         if (gFieldEffectArguments[7])
         {
             SeekSpriteAnim(sprite, 4);
@@ -320,28 +320,28 @@ void unc_grass_normal(struct Sprite *sprite)
     u8 mapObjectId;
     struct MapObject *mapObject;
 
-    mapNum = sprite->data5 >> 8;
-    mapGroup = sprite->data5;
+    mapNum = sprite->data[5] >> 8;
+    mapGroup = sprite->data[5];
     if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup))
     {
-        sprite->data1 -= gCamera.x;
-        sprite->data2 -= gCamera.y;
-        sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
+        sprite->data[1] -= gCamera.x;
+        sprite->data[2] -= gCamera.y;
+        sprite->data[5] = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
     }
-    localId = sprite->data3 >> 8;
-    mapNum = sprite->data3;
-    mapGroup = sprite->data4;
-    metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data1, sprite->data2);
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data7 && sprite->animEnded))
+    localId = sprite->data[3] >> 8;
+    mapNum = sprite->data[3];
+    mapGroup = sprite->data[4];
+    metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_TALL_GRASS);
     }
     else
     {
         mapObject = &gMapObjects[mapObjectId];
-        if ((mapObject->coords2.x != sprite->data1 || mapObject->coords2.y != sprite->data2) && (mapObject->coords3.x != sprite->data1 || mapObject->coords3.y != sprite->data2))
+        if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2]))
         {
-            sprite->data7 = TRUE;
+            sprite->data[7] = TRUE;
         }
         metatileBehavior = 0;
         if (sprite->animCmdIndex == 0)
@@ -349,7 +349,7 @@ void unc_grass_normal(struct Sprite *sprite)
             metatileBehavior = 4;
         }
         sub_806487C(sprite, 0);
-        sub_812882C(sprite, sprite->data0, metatileBehavior);
+        sub_812882C(sprite, sprite->data[0], metatileBehavior);
     }
 }
 
@@ -365,8 +365,8 @@ u32 FldEff_JumpTallGrass(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = 12;
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = 12;
     }
     return 0;
 }
@@ -381,7 +381,7 @@ u8 sub_8126FF0(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
         if (gSprites[i].inUse)
         {
             sprite = &gSprites[i];
-            if (sprite->callback == unc_grass_normal && (x == sprite->data1 && y == sprite->data2) && (localId == (u8)(sprite->data3 >> 8) && mapNum == (sprite->data3 & 0xFF) && mapGroup == sprite->data4))
+            if (sprite->callback == unc_grass_normal && (x == sprite->data[1] && y == sprite->data[2]) && (localId == (u8)(sprite->data[3] >> 8) && mapNum == (sprite->data[3] & 0xFF) && mapGroup == sprite->data[4]))
             {
                 return i;
             }
@@ -406,12 +406,12 @@ u32 FldEff_LongGrass(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = ZCoordToPriority(gFieldEffectArguments[2]);
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = gFieldEffectArguments[0];
-        sprite->data2 = gFieldEffectArguments[1];
-        sprite->data3 = gFieldEffectArguments[4];
-        sprite->data4 = gFieldEffectArguments[5];
-        sprite->data5 = gFieldEffectArguments[6];
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = gFieldEffectArguments[0];
+        sprite->data[2] = gFieldEffectArguments[1];
+        sprite->data[3] = gFieldEffectArguments[4];
+        sprite->data[4] = gFieldEffectArguments[5];
+        sprite->data[5] = gFieldEffectArguments[6];
         if (gFieldEffectArguments[7])
         {
             SeekSpriteAnim(sprite, 6);
@@ -429,31 +429,31 @@ void unc_grass_tall(struct Sprite *sprite)
     u8 mapObjectId;
     struct MapObject *mapObject;
 
-    mapNum = sprite->data5 >> 8;
-    mapGroup = sprite->data5;
+    mapNum = sprite->data[5] >> 8;
+    mapGroup = sprite->data[5];
     if (gCamera.field_0 && (gSaveBlock1.location.mapNum != mapNum || gSaveBlock1.location.mapGroup != mapGroup))
     {
-        sprite->data1 -= gCamera.x;
-        sprite->data2 -= gCamera.y;
-        sprite->data5 = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
+        sprite->data[1] -= gCamera.x;
+        sprite->data[2] -= gCamera.y;
+        sprite->data[5] = ((u8)gSaveBlock1.location.mapNum << 8) | (u8)gSaveBlock1.location.mapGroup;
     }
-    localId = sprite->data3 >> 8;
-    mapNum = sprite->data3;
-    mapGroup = sprite->data4;
-    metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data1, sprite->data2);
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data7 && sprite->animEnded))
+    localId = sprite->data[3] >> 8;
+    mapNum = sprite->data[3];
+    mapGroup = sprite->data[4];
+    metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
+    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_LONG_GRASS);
     }
     else
     {
         mapObject = &gMapObjects[mapObjectId];
-        if ((mapObject->coords2.x != sprite->data1 || mapObject->coords2.y != sprite->data2) && (mapObject->coords3.x != sprite->data1 || mapObject->coords3.y != sprite->data2))
+        if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2]))
         {
-            sprite->data7 = TRUE;
+            sprite->data[7] = TRUE;
         }
         sub_806487C(sprite, 0);
-        sub_812882C(sprite, sprite->data0, 0);
+        sub_812882C(sprite, sprite->data[0], 0);
     }
 }
 
@@ -469,8 +469,8 @@ u32 FldEff_JumpLongGrass(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = 18;
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = 18;
     }
     return 0;
 }
@@ -490,11 +490,11 @@ u32 FldEff_ShortGrass(void)
         sprite = &(gSprites[spriteId]);
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
-        sprite->data0 = gFieldEffectArguments[0];
-        sprite->data1 = gFieldEffectArguments[1];
-        sprite->data2 = gFieldEffectArguments[2];
-        sprite->data3 = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data4 = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[0] = gFieldEffectArguments[0];
+        sprite->data[1] = gFieldEffectArguments[1];
+        sprite->data[2] = gFieldEffectArguments[2];
+        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
     }
     return 0;
 }
@@ -507,7 +507,7 @@ void sub_8127334(struct Sprite *sprite)
     const struct MapObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_18)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_18)
     {
         FieldEffectStop(sprite, FLDEFF_SHORT_GRASS);
     }
@@ -517,10 +517,10 @@ void sub_8127334(struct Sprite *sprite)
         linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId];
         y = linkedSprite->pos1.y;
         x = linkedSprite->pos1.x;
-        if (x != sprite->data3 || y != sprite->data4)
+        if (x != sprite->data[3] || y != sprite->data[4])
         {
-            sprite->data3 = x;
-            sprite->data4 = y;
+            sprite->data[3] = x;
+            sprite->data[4] = y;
             if (sprite->animEnded)
             {
                 StartSpriteAnim(sprite, 0);
@@ -547,7 +547,7 @@ u32 FldEff_SandFootprints(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data7 = FLDEFF_SAND_FOOTPRINTS;
+        sprite->data[7] = FLDEFF_SAND_FOOTPRINTS;
         StartSpriteAnim(sprite, gFieldEffectArguments[4]);
     }
     return 0;
@@ -565,7 +565,7 @@ u32 FldEff_DeepSandFootprints(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data7 = FLDEFF_DEEP_SAND_FOOTPRINTS;
+        sprite->data[7] = FLDEFF_DEEP_SAND_FOOTPRINTS;
         StartSpriteAnim(sprite, gFieldEffectArguments[4]);
     }
     return spriteId;
@@ -583,7 +583,7 @@ u32 FldEff_BikeTireTracks(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data7 = FLDEFF_BIKE_TIRE_TRACKS;
+        sprite->data[7] = FLDEFF_BIKE_TIRE_TRACKS;
         StartSpriteAnim(sprite, gFieldEffectArguments[4]);
     }
     return spriteId;
@@ -591,14 +591,14 @@ u32 FldEff_BikeTireTracks(void)
 
 void sub_8127584(struct Sprite *sprite)
 {
-    gUnknown_08401E40[sprite->data0](sprite);
+    gUnknown_08401E40[sprite->data[0]](sprite);
 }
 
 static void sub_81275A0(struct Sprite *sprite)
 {
-    if (++sprite->data1 > 40)
+    if (++sprite->data[1] > 40)
     {
-        sprite->data0 = 1;
+        sprite->data[0] = 1;
     }
     sub_806487C(sprite, FALSE);
 }
@@ -606,11 +606,11 @@ static void sub_81275A0(struct Sprite *sprite)
 static void sub_81275C4(struct Sprite *sprite)
 {
     sprite->invisible ^= 1;
-    sprite->data1 ++;
+    sprite->data[1] ++;
     sub_806487C(sprite, sprite->invisible);
-    if (sprite->data1 > 56)
+    if (sprite->data[1] > 56)
     {
-        FieldEffectStop(sprite, sprite->data7);
+        FieldEffectStop(sprite, sprite->data[7]);
     }
 }
 
@@ -633,9 +633,9 @@ u32 FldEff_Splash(void)
         sprite->coordOffsetEnabled = TRUE;
         linkedSprite = &gSprites[mapObject->spriteId];
         sprite->oam.priority = linkedSprite->oam.priority;
-        sprite->data0 = gFieldEffectArguments[0];
-        sprite->data1 = gFieldEffectArguments[1];
-        sprite->data2 = gFieldEffectArguments[2];
+        sprite->data[0] = gFieldEffectArguments[0];
+        sprite->data[1] = gFieldEffectArguments[1];
+        sprite->data[2] = gFieldEffectArguments[2];
         sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
         PlaySE(SE_MIZU);
     }
@@ -646,7 +646,7 @@ void sub_81276B4(struct Sprite *sprite)
 {
     u8 mapObjectId;
 
-    if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId))
+    if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId))
     {
         FieldEffectStop(sprite, FLDEFF_SPLASH);
     }
@@ -670,8 +670,8 @@ u32 FldEff_JumpSmallSplash(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = FLDEFF_JUMP_SMALL_SPLASH;
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = FLDEFF_JUMP_SMALL_SPLASH;
     }
     return 0;
 }
@@ -688,8 +688,8 @@ u32 FldEff_JumpBigSplash(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = FLDEFF_JUMP_BIG_SPLASH;
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = FLDEFF_JUMP_BIG_SPLASH;
     }
     return 0;
 }
@@ -712,11 +712,11 @@ u32 FldEff_FeetInFlowingWater(void)
         sprite->callback = sub_81278D8;
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
-        sprite->data0 = gFieldEffectArguments[0];
-        sprite->data1 = gFieldEffectArguments[1];
-        sprite->data2 = gFieldEffectArguments[2];
-        sprite->data3 = -1;
-        sprite->data4 = -1;
+        sprite->data[0] = gFieldEffectArguments[0];
+        sprite->data[1] = gFieldEffectArguments[1];
+        sprite->data[2] = gFieldEffectArguments[2];
+        sprite->data[3] = -1;
+        sprite->data[4] = -1;
         sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
         StartSpriteAnim(sprite, 1);
     }
@@ -729,7 +729,7 @@ static void sub_81278D8(struct Sprite *sprite)
     struct Sprite *linkedSprite;
     struct MapObject *mapObject;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_19)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_19)
     {
         FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER);
     }
@@ -741,10 +741,10 @@ static void sub_81278D8(struct Sprite *sprite)
         sprite->pos1.y = linkedSprite->pos1.y;
         sprite->subpriority = linkedSprite->subpriority;
         sub_806487C(sprite, FALSE);
-        if (mapObject->coords2.x != sprite->data3 || mapObject->coords2.y != sprite->data4)
+        if (mapObject->coords2.x != sprite->data[3] || mapObject->coords2.y != sprite->data[4])
         {
-            sprite->data3 = mapObject->coords2.x;
-            sprite->data4 = mapObject->coords2.y;
+            sprite->data[3] = mapObject->coords2.x;
+            sprite->data[4] = mapObject->coords2.y;
             if (!sprite->invisible)
             {
                 PlaySE(SE_MIZU);
@@ -764,7 +764,7 @@ u32 FldEff_Ripple(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = FLDEFF_RIPPLE;
+        sprite->data[0] = FLDEFF_RIPPLE;
     }
     return 0;
 }
@@ -784,11 +784,11 @@ u32 FldEff_HotSpringsWater(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
-        sprite->data0 = gFieldEffectArguments[0];
-        sprite->data1 = gFieldEffectArguments[1];
-        sprite->data2 = gFieldEffectArguments[2];
-        sprite->data3 = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data4 = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[0] = gFieldEffectArguments[0];
+        sprite->data[1] = gFieldEffectArguments[1];
+        sprite->data[2] = gFieldEffectArguments[2];
+        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
     }
     return 0;
 }
@@ -799,7 +799,7 @@ void sub_8127A7C(struct Sprite *sprite)
     const struct MapObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_21)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_21)
     {
         FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER);
     }
@@ -826,7 +826,7 @@ u32 FldEff_Unknown19(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = FLDEFF_UNKNOWN_19;
+        sprite->data[0] = FLDEFF_UNKNOWN_19;
     }
     return 0;
 }
@@ -843,7 +843,7 @@ u32 FldEff_Unknown20(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = FLDEFF_UNKNOWN_20;
+        sprite->data[0] = FLDEFF_UNKNOWN_20;
     }
     return 0;
 }
@@ -860,7 +860,7 @@ u32 FldEff_Unknown21(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = FLDEFF_UNKNOWN_21;
+        sprite->data[0] = FLDEFF_UNKNOWN_21;
     }
     return 0;
 }
@@ -877,7 +877,7 @@ u32 FldEff_Unknown22(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = FLDEFF_UNKNOWN_22;
+        sprite->data[0] = FLDEFF_UNKNOWN_22;
     }
     return 0;
 }
@@ -909,26 +909,26 @@ u32 FldEff_Ash(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data1 = gFieldEffectArguments[0];
-        sprite->data2 = gFieldEffectArguments[1];
-        sprite->data3 = gFieldEffectArguments[4];
-        sprite->data4 = gFieldEffectArguments[5];
+        sprite->data[1] = gFieldEffectArguments[0];
+        sprite->data[2] = gFieldEffectArguments[1];
+        sprite->data[3] = gFieldEffectArguments[4];
+        sprite->data[4] = gFieldEffectArguments[5];
     }
     return 0;
 }
 
 void sub_8127D84(struct Sprite *sprite)
 {
-    gUnknown_08401E48[sprite->data0](sprite);
+    gUnknown_08401E48[sprite->data[0]](sprite);
 }
 
 static void sub_8127DA0(struct Sprite *sprite)
 {
     sprite->invisible = TRUE;
     sprite->animPaused = TRUE;
-    if (--sprite->data4 == 0)
+    if (--sprite->data[4] == 0)
     {
-        sprite->data0 = 1;
+        sprite->data[0] = 1;
     }
 }
 
@@ -936,10 +936,10 @@ static void sub_8127DD0(struct Sprite *sprite)
 {
     sprite->invisible = FALSE;
     sprite->animPaused = FALSE;
-    MapGridSetMetatileIdAt(sprite->data1, sprite->data2, sprite->data3);
-    CurrentMapDrawMetatileAt(sprite->data1, sprite->data2);
+    MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]);
+    CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]);
     gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_2 = TRUE;
-    sprite->data0 = 2;
+    sprite->data[0] = 2;
 }
 
 static void sub_8127E30(struct Sprite *sprite)
@@ -963,10 +963,10 @@ u32 FldEff_SurfBlob(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.paletteNum = 0;
-        sprite->data2 = gFieldEffectArguments[2];
-        sprite->data3 = -1;
-        sprite->data6 = -1;
-        sprite->data7 = -1;
+        sprite->data[2] = gFieldEffectArguments[2];
+        sprite->data[3] = -1;
+        sprite->data[6] = -1;
+        sprite->data[7] = -1;
     }
     FieldEffectActiveListRemove(FLDEFF_SURF_BLOB);
     return spriteId;
@@ -974,33 +974,33 @@ u32 FldEff_SurfBlob(void)
 
 void sub_8127ED0(u8 spriteId, u8 value)
 {
-    gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF) | (value & 0xF);
+    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF) | (value & 0xF);
 }
 
 void sub_8127EFC(u8 spriteId, u8 value)
 {
-    gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF0) | ((value & 0xF) << 4);
+    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF0) | ((value & 0xF) << 4);
 }
 
 void sub_8127F28(u8 spriteId, u8 value, s16 data1)
 {
-    gSprites[spriteId].data0 = (gSprites[spriteId].data0 & ~0xF00) | ((value & 0xF) << 8);
-    gSprites[spriteId].data1 = data1;
+    gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((value & 0xF) << 8);
+    gSprites[spriteId].data[1] = data1;
 }
 
 static u8 sub_8127F5C(struct Sprite *sprite)
 {
-    return sprite->data0 & 0xF;
+    return sprite->data[0] & 0xF;
 }
 
 static u8 sub_8127F64(struct Sprite *sprite)
 {
-    return (sprite->data0 & 0xF0) >> 4;
+    return (sprite->data[0] & 0xF0) >> 4;
 }
 
 static u8 sub_8127F70(struct Sprite *sprite)
 {
-    return (sprite->data0 & 0xF00) >> 8;
+    return (sprite->data[0] & 0xF00) >> 8;
 }
 
 void sub_8127F7C(struct Sprite *sprite)
@@ -1008,7 +1008,7 @@ void sub_8127F7C(struct Sprite *sprite)
     struct MapObject *mapObject;
     struct Sprite *linkedSprite;
 
-    mapObject = &gMapObjects[sprite->data2];
+    mapObject = &gMapObjects[sprite->data[2]];
     linkedSprite = &gSprites[mapObject->spriteId];
     sub_8127FD4(mapObject, sprite);
     sub_812800C(mapObject, sprite);
@@ -1036,15 +1036,15 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
 
     x = mapObject->coords2.x;
     y = mapObject->coords2.y;
-    if (sprite->pos2.y == 0 && (x != sprite->data6 || y != sprite->data7))
+    if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7]))
     {
-        sprite->data5 = sprite->pos2.y;
-        for (sprite->data6 = x, sprite->data7 = y, i = DIR_SOUTH; i <= DIR_EAST; i ++, x = sprite->data6, y = sprite->data7)
+        sprite->data[5] = sprite->pos2.y;
+        for (sprite->data[6] = x, sprite->data[7] = y, i = DIR_SOUTH; i <= DIR_EAST; i ++, x = sprite->data[6], y = sprite->data[7])
         {
             MoveCoords(i, &x, &y);
             if (MapGridGetZCoordAt(x, y) == 3)
             {
-                sprite->data5 ++;
+                sprite->data[5] ++;
                 break;
             }
         }
@@ -1141,13 +1141,13 @@ static void sub_81280A0(struct MapObject *mapObject, struct Sprite *linkedSprite
     v0 = sub_8127F5C(sprite);
     if (v0 != 0)
     {
-        if (((u16)(++ sprite->data4) & unk_8401E5A[sprite->data5]) == 0)
+        if (((u16)(++ sprite->data[4]) & unk_8401E5A[sprite->data[5]]) == 0)
         {
-            sprite->pos2.y += sprite->data3;
+            sprite->pos2.y += sprite->data[3];
         }
-        if ((sprite->data4 & 0x0F) == 0)
+        if ((sprite->data[4] & 0x0F) == 0)
         {
-            sprite->data3 = -sprite->data3;
+            sprite->data[3] = -sprite->data[3];
         }
         if (v0 != 2)
         {
@@ -1157,7 +1157,7 @@ static void sub_81280A0(struct MapObject *mapObject, struct Sprite *linkedSprite
             }
             else
             {
-                linkedSprite->pos2.y = sprite->data1 + sprite->pos2.y;
+                linkedSprite->pos2.y = sprite->data[1] + sprite->pos2.y;
             }
             sprite->pos1.x = linkedSprite->pos1.x;
             sprite->pos1.y = linkedSprite->pos1.y + 8;
@@ -1174,8 +1174,8 @@ u8 sub_8128124(u8 oldSpriteId)
     sprite = &gSprites[spriteId];
     sprite->callback = sub_8128174;
     sprite->invisible = TRUE;
-    sprite->data0 = oldSpriteId;
-    sprite->data1 = 1;
+    sprite->data[0] = oldSpriteId;
+    sprite->data[1] = 1;
     return spriteId;
 }
 
@@ -1183,14 +1183,14 @@ static void sub_8128174(struct Sprite *sprite)
 {
     struct Sprite *oldSprite;
 
-    oldSprite = &gSprites[sprite->data0];
-    if (((sprite->data2++) & 0x03) == 0)
+    oldSprite = &gSprites[sprite->data[0]];
+    if (((sprite->data[2]++) & 0x03) == 0)
     {
-        oldSprite->pos2.y += sprite->data1;
+        oldSprite->pos2.y += sprite->data[1];
     }
-    if ((sprite->data2 & 0x0F) == 0)
+    if ((sprite->data[2] & 0x0F) == 0)
     {
-        sprite->data1 = -sprite->data1;
+        sprite->data[1] = -sprite->data[1];
     }
 }
 
@@ -1206,8 +1206,8 @@ u32 FldEff_Dust(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
-        sprite->data0 = gFieldEffectArguments[2];
-        sprite->data1 = 10;
+        sprite->data[0] = gFieldEffectArguments[2];
+        sprite->data[1] = 10;
     }
     return 0;
 }
@@ -1229,11 +1229,11 @@ u32 FldEff_SandPile(void)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
-        sprite->data0 = gFieldEffectArguments[0];
-        sprite->data1 = gFieldEffectArguments[1];
-        sprite->data2 = gFieldEffectArguments[2];
-        sprite->data3 = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data4 = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[0] = gFieldEffectArguments[0];
+        sprite->data[1] = gFieldEffectArguments[1];
+        sprite->data[2] = gFieldEffectArguments[2];
+        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
         sprite->pos2.y = (graphicsInfo->height >> 1) - 2;
         SeekSpriteAnim(sprite, 2);
     }
@@ -1246,7 +1246,7 @@ void sub_81282E0(struct Sprite *sprite)
     s16 x;
     s16 y;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_20)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_20)
     {
         FieldEffectStop(sprite, FLDEFF_SAND_PILE);
     }
@@ -1254,10 +1254,10 @@ void sub_81282E0(struct Sprite *sprite)
     {
         y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y;
         x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x;
-        if (x != sprite->data3 || y != sprite->data4)
+        if (x != sprite->data[3] || y != sprite->data[4])
         {
-            sprite->data3 = x;
-            sprite->data4 = y;
+            sprite->data[3] = x;
+            sprite->data[4] = y;
             if (sprite->animEnded)
             {
                 StartSpriteAnim(sprite, 0);
@@ -1288,9 +1288,9 @@ u32 FldEff_Bubbles(void)
 
 void sub_8128410(struct Sprite *sprite)
 {
-    sprite->data0 += 0x80;
-    sprite->data0 &= 0x100;
-    sprite->pos1.y -= sprite->data0 >> 8;
+    sprite->data[0] += 0x80;
+    sprite->data[0] &= 0x100;
+    sprite->pos1.y -= sprite->data[0] >> 8;
     sub_806487C(sprite, FALSE);
     if (sprite->invisible || sprite->animEnded)
     {
@@ -1311,7 +1311,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void)
         sprite->coordOffsetEnabled = TRUE;
         sprite->oam.priority = gFieldEffectArguments[3];
         sprite->oam.paletteNum = 5;
-        sprite->data0 = FLDEFF_BERRY_TREE_GROWTH_SPARKLE;
+        sprite->data[0] = FLDEFF_BERRY_TREE_GROWTH_SPARKLE;
     }
     return 0;
 }
@@ -1349,10 +1349,10 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled ++;
         sprite->oam.paletteNum = paletteNum;
-        sprite->data1 = fldEff;
-        sprite->data2 = gFieldEffectArguments[0];
-        sprite->data3 = gFieldEffectArguments[1];
-        sprite->data4 = gFieldEffectArguments[2];
+        sprite->data[1] = fldEff;
+        sprite->data[2] = gFieldEffectArguments[0];
+        sprite->data[3] = gFieldEffectArguments[1];
+        sprite->data[4] = gFieldEffectArguments[2];
     }
     return spriteId;
 }
@@ -1363,9 +1363,9 @@ void sub_81285AC(struct Sprite *sprite)
     const struct MapObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data2, sprite->data3, sprite->data4, &mapObjectId))
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &mapObjectId))
     {
-        FieldEffectStop(sprite, sprite->data1);
+        FieldEffectStop(sprite, sprite->data[1]);
     }
     // else {
     graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
@@ -1374,18 +1374,18 @@ void sub_81285AC(struct Sprite *sprite)
     sprite->pos1.x = linkedSprite->pos1.x;
     sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16;
     sprite->subpriority = linkedSprite->subpriority - 1;
-    if (sprite->data0 == 1)
+    if (sprite->data[0] == 1)
     {
-        sprite->data0 ++;
+        sprite->data[0] ++;
         StartSpriteAnim(sprite, 1);
     }
-    if (sprite->data0 == 2 && sprite->animEnded)
+    if (sprite->data[0] == 2 && sprite->animEnded)
     {
-        sprite->data7 = 1;
+        sprite->data[7] = 1;
     }
-    if (sprite->data0 == 3)
+    if (sprite->data[0] == 3)
     {
-        FieldEffectStop(sprite, sprite->data1);
+        FieldEffectStop(sprite, sprite->data[1]);
     }
     // }
 }
@@ -1394,7 +1394,7 @@ void sub_812869C(struct MapObject *mapObject)
 {
     if (mapObject->mapobj_unk_21 == 1)
     {
-        gSprites[mapObject->mapobj_unk_1A].data0 ++;
+        gSprites[mapObject->mapobj_unk_1A].data[0] ++;
     }
 }
 
@@ -1411,10 +1411,10 @@ bool8 sub_81286C4(struct MapObject *mapObject)
         return TRUE;
     }
     sprite = &gSprites[mapObject->mapobj_unk_1A];
-    if (sprite->data7)
+    if (sprite->data[7])
     {
         mapObject->mapobj_unk_21 = 2;
-        sprite->data0 ++;
+        sprite->data[0] ++;
         return TRUE;
     }
     return FALSE;
@@ -1438,19 +1438,19 @@ u32 FldEff_Sparkle(void)
 
 void sub_8128774(struct Sprite *sprite)
 {
-    if (sprite->data0 == 0)
+    if (sprite->data[0] == 0)
     {
         if (sprite->animEnded)
         {
             sprite->invisible = TRUE;
-            sprite->data0 ++;
+            sprite->data[0] ++;
         }
-        if (sprite->data0 == 0)
+        if (sprite->data[0] == 0)
         {
             return;
         }
     }
-    if (++ sprite->data1 >= 35)
+    if (++ sprite->data[1] >= 35)
     {
         FieldEffectStop(sprite, FLDEFF_SPARKLE);
     }
@@ -1460,12 +1460,12 @@ void sub_81287C4(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
-        FieldEffectStop(sprite, sprite->data1);
+        FieldEffectStop(sprite, sprite->data[1]);
     }
     else
     {
         sub_806487C(sprite, FALSE);
-        SetObjectSubpriorityByZCoord(sprite->data0, sprite, 0);
+        SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0);
     }
 }
 
@@ -1473,7 +1473,7 @@ void sub_8128800(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
-        FieldEffectStop(sprite, sprite->data0);
+        FieldEffectStop(sprite, sprite->data[0]);
     }
     else
     {
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c
index 74ef3b7fe..98f6fedab 100644
--- a/src/field/field_map_obj.c
+++ b/src/field/field_map_obj.c
@@ -2343,7 +2343,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
     sprite->oam.paletteNum = gfxInfo->paletteSlot;
     sprite->coordOffsetEnabled = TRUE;
-    sprite->data0 = mapObjectId;
+    sprite->data[0] = mapObjectId;
     mapObject->spriteId = spriteId;
     mapObject->mapobj_bit_12 = gfxInfo->inanimate;
     if (!mapObject->mapobj_bit_12)
@@ -2489,8 +2489,8 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction)
         sprite->pos1.y += sprite->centerToCornerVecY;
         sprite->oam.paletteNum = gfxInfo->paletteSlot;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data0 = b;
-        sprite->data1 = elevation;
+        sprite->data[0] = b;
+        sprite->data[1] = elevation;
         if (gfxInfo->paletteSlot == 10)
             npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot);
         if (subspriteTables != NULL)
@@ -2640,7 +2640,7 @@ void sub_805B75C(u8 a, s16 b, s16 c)
             SetSubspriteTables(sprite, subspriteTables);
         sprite->oam.paletteNum = gfxInfo->paletteSlot;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data0 = a;
+        sprite->data[0] = a;
         mapObject->spriteId = spriteId;
         if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 11)
             StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18));
@@ -3042,7 +3042,7 @@ u8 AddCameraObject(u8 a)
     u8 spriteId = CreateSprite(&gSpriteTemplate_830FD24, 0, 0, 4);
 
     gSprites[spriteId].invisible = TRUE;
-    gSprites[spriteId].data0 = a;
+    gSprites[spriteId].data[0] = a;
     return spriteId;
 }
 
@@ -3050,35 +3050,35 @@ void ObjectCB_CameraObject(struct Sprite *sprite)
 {
     void (*cameraObjectFuncs[3])(struct Sprite *);
     memcpy(cameraObjectFuncs, gCameraObjectFuncs, sizeof gCameraObjectFuncs);
-    cameraObjectFuncs[sprite->data1](sprite);
+    cameraObjectFuncs[sprite->data[1]](sprite);
 }
 
 void CameraObject_0(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->data0].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data0].pos1.y;
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
     sprite->invisible = TRUE;
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     CameraObject_1(sprite);
 }
 
 void CameraObject_1(struct Sprite *sprite)
 {
-    s16 x = gSprites[sprite->data0].pos1.x;
-    s16 y = gSprites[sprite->data0].pos1.y;
+    s16 x = gSprites[sprite->data[0]].pos1.x;
+    s16 y = gSprites[sprite->data[0]].pos1.y;
 
-    sprite->data2 = x - sprite->pos1.x;
-    sprite->data3 = y - sprite->pos1.y;
+    sprite->data[2] = x - sprite->pos1.x;
+    sprite->data[3] = y - sprite->pos1.y;
     sprite->pos1.x = x;
     sprite->pos1.y = y;
 }
 
 void CameraObject_2(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->data0].pos1.x;
-    sprite->pos1.y = gSprites[sprite->data0].pos1.y;
-    sprite->data2 = 0;
-    sprite->data3 = 0;
+    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
+    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
 }
 
 struct Sprite *FindCameraObject(void)
@@ -3099,7 +3099,7 @@ void CameraObjectReset1(void)
 
     if (cameraSprite != NULL)
     {
-        cameraSprite->data1 = 0;
+        cameraSprite->data[1] = 0;
         cameraSprite->callback(cameraSprite);
     }
 }
@@ -3110,7 +3110,7 @@ void CameraObjectSetFollowedObjectId(u8 spriteId)
 
     if (cameraSprite != NULL)
     {
-        cameraSprite->data0 = spriteId;
+        cameraSprite->data[0] = spriteId;
         CameraObjectReset1();
     }
 }
@@ -3122,14 +3122,14 @@ u8 CameraObjectGetFollowedObjectId(void)
     if (cameraSprite == NULL)
         return 64;
     else
-        return cameraSprite->data0;
+        return cameraSprite->data[0];
 }
 
 void CameraObjectReset2(void)
 {
     struct Sprite *cameraSprite = FindCameraObject();
 
-    cameraSprite->data1 = 2;
+    cameraSprite->data[1] = 2;
 }
 
 u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority)
@@ -3333,7 +3333,7 @@ fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224);
 u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -3342,7 +3342,7 @@ extern void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8);
 u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -3356,7 +3356,7 @@ u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite)
         return 0;
     }
     sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return 1;
 }
 
@@ -3366,7 +3366,7 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) != 0)
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -3381,10 +3381,10 @@ u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_08375240, 4);
     direction = directions[Random() & 3];
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (sub_805FF20(mapObject, direction) != 0)
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 1;
 }
@@ -3393,7 +3393,7 @@ u8 sub_805C9D8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return 1;
 }
 
@@ -3402,7 +3402,7 @@ u8 sub_805CA08(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -3649,14 +3649,14 @@ fieldmap_object_cb(sub_805CDE8, sub_805CE0c, gUnknown_08375270);
 u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805CE40(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -3666,7 +3666,7 @@ u8 sub_805CE6C(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -3675,7 +3675,7 @@ u8 sub_805CEB0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -3692,7 +3692,7 @@ u8 sub_805CEE0(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 3];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -3701,14 +3701,14 @@ fieldmap_object_cb(sub_805CF28, sub_805CF4C, gUnknown_08375284);
 u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805CF80(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -3719,7 +3719,7 @@ u8 sub_805CFAC(struct MapObject *mapObject, struct Sprite *sprite)
         return 0;
     }
     sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return 1;
 }
 
@@ -3727,7 +3727,7 @@ u8 sub_805CFE8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) != 0)
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -3740,10 +3740,10 @@ u8 sub_805D008(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_083752A0, 2);
     direction = directions[Random() & 1];
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (sub_805FF20(mapObject, direction) != 0)
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 1;
 }
@@ -3752,7 +3752,7 @@ u8 sub_805D054(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return 1;
 }
 
@@ -3761,7 +3761,7 @@ u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -3771,14 +3771,14 @@ fieldmap_object_cb(sub_805D0AC, sub_805D0D0, gUnknown_083752A4);
 u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -3789,7 +3789,7 @@ u8 sub_805D130(struct MapObject *mapObject, struct Sprite *sprite)
         return 0;
     }
     sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return 1;
 }
 
@@ -3797,7 +3797,7 @@ u8 sub_805D16C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) != 0)
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -3810,10 +3810,10 @@ u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite)
     memcpy(directions, gUnknown_083752C0, 2);
     direction = directions[Random() & 1];
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 5;
+    sprite->data[1] = 5;
     if (sub_805FF20(mapObject, direction) != 0)
     {
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 1;
 }
@@ -3822,7 +3822,7 @@ u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18));
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 6;
+    sprite->data[1] = 6;
     return 1;
 }
 
@@ -3831,7 +3831,7 @@ u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -3842,7 +3842,7 @@ u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -3850,7 +3850,7 @@ u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return 1;
     }
     return 0;
@@ -3867,18 +3867,18 @@ u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite);
 void FieldObjectCB_BerryTree(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data0];
-    if (!(sprite->data7 & 1))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (!(sprite->data[7] & 1))
     {
         get_berry_tree_graphics(mapObject, sprite);
-        sprite->data7 |= 1;
+        sprite->data[7] |= 1;
     }
     meta_step(mapObject, sprite, sub_805D314);
 }
 
 u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    return gUnknown_083752D0[sprite->data1](mapObject, sprite);
+    return gUnknown_083752D0[sprite->data[1]](mapObject, sprite);
 }
 
 u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sprite)
@@ -3890,7 +3890,7 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
     berryTreeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
     if (!berryTreeStage)
     {
-        if (!(sprite->data7 & 4) && sprite->animNum == 4)
+        if (!(sprite->data[7] & 4) && sprite->animNum == 4)
         {
             gFieldEffectArguments[0] = mapObject->coords2.x;
             gFieldEffectArguments[1] = mapObject->coords2.y;
@@ -3906,12 +3906,12 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
     berryTreeStage--;
     if (sprite->animNum != berryTreeStage)
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return 1;
     }
     get_berry_tree_graphics(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, 0x39);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -3919,7 +3919,7 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
         return 1;
     }
     return 0;
@@ -3928,9 +3928,9 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite)
 u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 3;
-    sprite->data2 = 0;
-    sprite->data7 |= 2;
+    sprite->data[1] = 3;
+    sprite->data[2] = 0;
+    sprite->data[7] |= 2;
     gFieldEffectArguments[0] = mapObject->coords2.x;
     gFieldEffectArguments[1] = mapObject->coords2.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
@@ -3941,14 +3941,14 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp
 
 u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data2++;
-    mapObject->mapobj_bit_13 = ((sprite->data2 & 0x2) >> 1);
+    sprite->data[2]++;
+    mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1);
     sprite->animPaused = 1;
-    if (sprite->data2 > 64)
+    if (sprite->data[2] > 64)
     {
         get_berry_tree_graphics(mapObject, sprite);
-        sprite->data1 = 4;
-        sprite->data2 = 0;
+        sprite->data[1] = 4;
+        sprite->data[2] = 0;
         return 1;
     }
     return 0;
@@ -3956,13 +3956,13 @@ u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite)
 
 u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data2++;
-    mapObject->mapobj_bit_13 = ((sprite->data2 & 0x2) >> 1);
+    sprite->data[2]++;
+    mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1);
     sprite->animPaused = 1;
-    if (sprite->data2 > 64)
+    if (sprite->data[2] > 64)
     {
-        sprite->data1 = 0;
-        sprite->data7 &= (-3);
+        sprite->data[1] = 0;
+        sprite->data[7] &= (-3);
         return 1;
     }
     return 0;
@@ -3973,14 +3973,14 @@ fieldmap_object_cb(sub_805D4F4, sub_805D518, gUnknown_083752E4);
 u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805D54C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -3990,7 +3990,7 @@ u8 sub_805D578(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -3999,7 +3999,7 @@ u8 sub_805D5BC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4016,7 +4016,7 @@ u8 sub_805D5EC(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4025,14 +4025,14 @@ fieldmap_object_cb(sub_805D634, sub_805D658, gUnknown_083752F8);
 u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805D68C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4042,7 +4042,7 @@ u8 sub_805D6B8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4051,7 +4051,7 @@ u8 sub_805D6FC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4068,7 +4068,7 @@ u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4077,14 +4077,14 @@ fieldmap_object_cb(sub_805D774, sub_805D798, gUnknown_0837530C);
 u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4094,7 +4094,7 @@ u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4103,7 +4103,7 @@ u8 sub_805D83C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4120,7 +4120,7 @@ u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4129,14 +4129,14 @@ fieldmap_object_cb(sub_805D8B4, sub_805D8D8, gUnknown_08375324);
 u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805D90C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4146,7 +4146,7 @@ u8 sub_805D938(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4155,7 +4155,7 @@ u8 sub_805D97C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4172,7 +4172,7 @@ u8 sub_805D9AC(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4181,14 +4181,14 @@ fieldmap_object_cb(sub_805D9F4, sub_805DA18, gUnknown_0837533C);
 u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805DA4C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4198,7 +4198,7 @@ u8 sub_805DA78(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4207,7 +4207,7 @@ u8 sub_805DABC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4224,7 +4224,7 @@ u8 sub_805DAEC(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4233,14 +4233,14 @@ fieldmap_object_cb(sub_805DB34, sub_805DB58, gUnknown_08375354);
 u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805DB8C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4250,7 +4250,7 @@ u8 sub_805DBB8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4259,7 +4259,7 @@ u8 sub_805DBFC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4276,7 +4276,7 @@ u8 sub_805DC2C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 1];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4285,14 +4285,14 @@ fieldmap_object_cb(sub_805DC74, sub_805DC98, gUnknown_0837536C);
 u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805DCCC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4302,7 +4302,7 @@ u8 sub_805DCF8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4311,7 +4311,7 @@ u8 sub_805DD3C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4328,7 +4328,7 @@ u8 sub_805DD6C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 3];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4337,14 +4337,14 @@ fieldmap_object_cb(sub_805DDB4, sub_805DDD8, gUnknown_08375384);
 u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805DE0C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4354,7 +4354,7 @@ u8 sub_805DE38(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4363,7 +4363,7 @@ u8 sub_805DE7C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4380,7 +4380,7 @@ u8 sub_805DEAC(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 3];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4389,14 +4389,14 @@ fieldmap_object_cb(sub_805DEF4, sub_805DF18, gUnknown_0837539C);
 u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805DF4C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4406,7 +4406,7 @@ u8 sub_805DF78(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4415,7 +4415,7 @@ u8 sub_805DFBC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4432,7 +4432,7 @@ u8 sub_805DFEC(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 3];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4441,14 +4441,14 @@ fieldmap_object_cb(sub_805E034, sub_805E058, gUnknown_083753B4);
 u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
 u8 sub_805E08C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4458,7 +4458,7 @@ u8 sub_805E0B8(struct MapObject *mapObject, struct Sprite *sprite)
     {
         sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4467,7 +4467,7 @@ u8 sub_805E0FC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 4;
+        sprite->data[1] = 4;
         return 1;
     }
     return 0;
@@ -4484,7 +4484,7 @@ u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[Random() & 3];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4494,7 +4494,7 @@ u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4503,7 +4503,7 @@ u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         sub_8064820(sprite, 0x30);
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
     }
     return 0;
 }
@@ -4512,7 +4512,7 @@ u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4528,7 +4528,7 @@ u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[mapObject->mapobj_unk_18];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
     return 1;
 }
 
@@ -4538,7 +4538,7 @@ u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4547,7 +4547,7 @@ u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         sub_8064820(sprite, 0x30);
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
     }
     return 0;
 }
@@ -4556,7 +4556,7 @@ u8 sub_805E30C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
     {
-        sprite->data1 = 3;
+        sprite->data[1] = 3;
     }
     return 0;
 }
@@ -4572,7 +4572,7 @@ u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite)
         direction = directions[mapObject->mapobj_unk_18];
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
     return 1;
 }
 
@@ -4581,7 +4581,7 @@ fieldmap_object_cb(sub_805E37C, sub_805E3A0, gUnknown_083753FC);
 u8 sub_805E3C0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4594,7 +4594,7 @@ u8 sub_805E3D4(struct MapObject *mapObject, struct Sprite *sprite)
         direction = GetOppositeDirection(direction);
     }
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4622,7 +4622,7 @@ u8 sub_805E40C(struct MapObject *mapObject, struct Sprite *sprite)
     }
     FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId);
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 3;
+    sprite->data[1] = 3;
     return 1;
 }
 
@@ -4631,7 +4631,7 @@ u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -4639,7 +4639,7 @@ u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite)
 u8 sub_805E4EC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -4667,7 +4667,7 @@ u8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct
     }
     FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId);
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -4676,7 +4676,7 @@ u8 sub_805E5B4(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -5004,7 +5004,7 @@ u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite
     {
         mapObject->mapobj_unk_21 = player_get_direction_lower_nybble();
     }
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -5022,7 +5022,7 @@ u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite)
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
         mapObject->mapobj_bit_1 = 0;
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
     }
     return 0;
 }
@@ -5036,7 +5036,7 @@ bool8 sub_805F3F0(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo
 {
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, a2)));
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -5055,7 +5055,7 @@ bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = 1;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return 1;
 }
 
@@ -5074,7 +5074,7 @@ bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5093,7 +5093,7 @@ bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5112,7 +5112,7 @@ bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5124,7 +5124,7 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl
     direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction);
     FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction));
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5143,7 +5143,7 @@ bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5164,7 +5164,7 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD
         FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
     }
     mapObject->mapobj_bit_1 = TRUE;
-    sprite->data1 = 2;
+    sprite->data[1] = 2;
     return TRUE;
 }
 
@@ -5184,15 +5184,15 @@ u8 sub_805F9F8(struct MapObject *, struct Sprite *);
 void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data0];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0))
     {
         FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805F9F8);
+    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8);
 }
 
 u8 sub_805F9F8(struct MapObject *mapObject, struct Sprite *sprite)
@@ -5204,34 +5204,34 @@ u8 sub_805F9F8(struct MapObject *mapObject, struct Sprite *sprite)
 void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
 {
     struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data0];
-    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
+    mapObject = &gMapObjects[sprite->data[0]];
+    if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0))
     {
         FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
         mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
         mapObject->mapobj_unk_21 = 1;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805F9F8);
+    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8);
 }
 
 u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite);
 
 void FieldObjectCB_Hidden1(struct Sprite *sprite)
 {
-    if (sprite->data7 == 0)
+    if (sprite->data[7] == 0)
     {
-        gMapObjects[sprite->data0].mapobj_bit_26 = 1;
+        gMapObjects[sprite->data[0]].mapobj_bit_26 = 1;
         sprite->subspriteMode = 2;
         sprite->oam.priority = 3;
-        sprite->data7 ++;
+        sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data0], sprite, sub_805FAD8);
+    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805FAD8);
 }
 
 u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    return gUnknown_083755CC[sprite->data1](mapObject, sprite);
+    return gUnknown_083755CC[sprite->data[1]](mapObject, sprite);
 }
 
 u8 sub_805FAF8(struct MapObject *mapObject, struct Sprite *sprite)
@@ -5244,7 +5244,7 @@ u8 sub_805FB04(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
     }
     return 0;
 }
@@ -5255,7 +5255,7 @@ u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -5265,7 +5265,7 @@ u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -5275,7 +5275,7 @@ u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite)
 {
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -5286,7 +5286,7 @@ u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite)
     npc_reset(mapObject, sprite);
     FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18));
     mapObject->mapobj_bit_13 = 1;
-    sprite->data1 = 1;
+    sprite->data[1] = 1;
     return 1;
 }
 
@@ -5294,7 +5294,7 @@ u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (FieldObjectExecRegularAnim(mapObject, sprite))
     {
-        sprite->data1 = 2;
+        sprite->data[1] = 2;
         return 1;
     }
     return 0;
@@ -5314,7 +5314,7 @@ void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
     mapObject->mapobj_bit_6 = 0;
     mapObject->mapobj_bit_7 = 0;
     mapObject->mapobj_unk_1C = 0xff;
-    sprite->data1 = 0;
+    sprite->data[1] = 0;
 }
 
 u8 FieldObjectDirectionToImageAnimId(u8 direction)
@@ -5446,7 +5446,7 @@ void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern)
     mapObject->mapobj_unk_21 = 0;
     mapObject->animId = 0;
     gSprites[mapObject->spriteId].callback = gUnknown_0836DA88[animPattern];
-    gSprites[mapObject->spriteId].data1 = 0;
+    gSprites[mapObject->spriteId].data[1] = 0;
 }
 
 u8 npc_running_behaviour_by_direction(u8 direction)
@@ -5555,7 +5555,7 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
     u8 mapObjectId;
 
     if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        if (gSprites[gMapObjects[mapObjectId].spriteId].data7 & 2)
+        if (gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 2)
             return TRUE;
 
     return FALSE;
@@ -5566,7 +5566,7 @@ void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup)
     u8 mapObjectId;
     if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
     {
-        gSprites[gMapObjects[mapObjectId].spriteId].data7 |= 4;
+        gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 4;
     }
 }
 
@@ -5704,7 +5704,7 @@ bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
     mapObject->mapobj_unk_1C = specialAnimId;
     mapObject->mapobj_bit_6 = 1;
     mapObject->mapobj_bit_7 = 0;
-    gSprites[mapObject->spriteId].data2 = 0;
+    gSprites[mapObject->spriteId].data[2] = 0;
     return FALSE;
 }
 
@@ -5727,8 +5727,8 @@ void FieldObjectClearAnim(struct MapObject *mapObject)
     mapObject->mapobj_unk_1C = 0xFF;
     mapObject->mapobj_bit_6 = 0;
     mapObject->mapobj_bit_7 = 0;
-    gSprites[mapObject->spriteId].data1 = 0;
-    gSprites[mapObject->spriteId].data2 = 0;
+    gSprites[mapObject->spriteId].data[1] = 0;
+    gSprites[mapObject->spriteId].data[2] = 0;
 }
 
 bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject)
@@ -5962,7 +5962,7 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2)
 
 void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite))
+    if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
     {
         mapObject->mapobj_bit_7 = 1;
     }
@@ -5970,10 +5970,10 @@ void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *spri
 
 bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data2](mapObject, sprite))
+    if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite))
     {
         mapObject->mapobj_unk_1C = 0xFF;
-        sprite->data2 = 0;
+        sprite->data[2] = 0;
         return 1;
     }
     return 0;
@@ -5982,7 +5982,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr
 void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
 {
     mapObject->mapobj_unk_1C = animId;
-    sprite->data2 = 0;
+    sprite->data[2] = 0;
 }
 
 void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
@@ -5991,7 +5991,7 @@ void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     npc_coords_shift_still(mapObject);
     sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18));
     sprite->animPaused = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 u8 sub_8060CE0(struct MapObject *mapObject, struct Sprite *sprite)
@@ -6030,7 +6030,7 @@ void sub_8060D20(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     oamt_npc_ministep_reset(sprite, direction, a3);
     sprite->animPaused = 0;
     mapObject->mapobj_bit_2 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 extern u8 (*const gUnknown_083759C0[5])(u8);
@@ -6075,7 +6075,7 @@ void sub_8060E68(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sub_806467C(sprite, direction);
     sprite->animPaused = 0;
     mapObject->mapobj_bit_2 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 void sub_8060ED8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
@@ -6108,7 +6108,7 @@ bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6126,7 +6126,7 @@ bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6144,7 +6144,7 @@ bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6162,7 +6162,7 @@ bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (an_walk_any_2(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6180,7 +6180,7 @@ bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6198,7 +6198,7 @@ bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6216,7 +6216,7 @@ bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6234,7 +6234,7 @@ bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6252,7 +6252,7 @@ void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     sub_8060320(direction, &x, &y, vSPp4[a4], vSPp4[a4]);
     npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
     sub_80646E4(sprite, direction, a4, a5);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     sprite->animPaused = 0;
     mapObject->mapobj_bit_2 = 1;
     mapObject->mapobj_bit_4 = 1;
@@ -6273,11 +6273,11 @@ u8 sub_806123C(struct MapObject *mapObject, struct Sprite *sprite, u8 (*const ca
     u8 retval;
     memcpy(vSPp4, gUnknown_08375A3A, sizeof gUnknown_08375A3A);
     retval = callback(sprite);
-    if (retval == 1 && vSPp4[sprite->data4] != 0)
+    if (retval == 1 && vSPp4[sprite->data[4]] != 0)
     {
         x = 0;
         y = 0;
-        sub_8060320(mapObject->placeholder18, &x, &y, vSPp4[sprite->data4], vSPp4[sprite->data4]);
+        sub_8060320(mapObject->placeholder18, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]);
         npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y);
         mapObject->mapobj_bit_2 = 1;
         mapObject->mapobj_bit_4 = 1;
@@ -6353,7 +6353,7 @@ bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6370,7 +6370,7 @@ bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6387,7 +6387,7 @@ bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6404,7 +6404,7 @@ bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6412,16 +6412,16 @@ bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite)
 
 void sub_8061508(struct Sprite *sprite, u16 duration)
 {
-    sprite->data2 = 1;
-    sprite->data3 = duration;
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
 }
 
 bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data3--;
-    if (!sprite->data3)
+    sprite->data[3]--;
+    if (!sprite->data[3])
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6472,7 +6472,7 @@ bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6487,7 +6487,7 @@ bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6502,7 +6502,7 @@ bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6517,7 +6517,7 @@ bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6528,16 +6528,16 @@ void sub_80616CC(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     FieldObjectSetDirection(mapObject, direction);
     sub_805FE28(mapObject, sprite, animId);
     sprite->animPaused = 0;
-    sprite->data2 = 1;
-    sprite->data3 = duration;
+    sprite->data[2] = 1;
+    sprite->data[3] = duration;
 }
 
 bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    sprite->data3--;
-    if (sprite->data3 == 0)
+    sprite->data[3]--;
+    if (sprite->data[3] == 0)
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         sprite->animPaused = 1;
         return TRUE;
     }
@@ -6546,7 +6546,7 @@ bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
 
 bool8 sub_806173C(struct MapObject *mapObject, struct Sprite *sprite)
 {
-    if (sprite->data3 & 1)
+    if (sprite->data[3] & 1)
     {
         sprite->animDelayCounter++;
     }
@@ -6661,7 +6661,7 @@ bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6680,7 +6680,7 @@ bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6699,7 +6699,7 @@ bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6718,7 +6718,7 @@ bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6736,7 +6736,7 @@ bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6754,7 +6754,7 @@ bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6773,7 +6773,7 @@ bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6792,7 +6792,7 @@ bool8 sub_8061CD8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6810,7 +6810,7 @@ bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6828,7 +6828,7 @@ bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6847,7 +6847,7 @@ bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6866,7 +6866,7 @@ bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6884,7 +6884,7 @@ bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6902,7 +6902,7 @@ bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6920,7 +6920,7 @@ bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6938,7 +6938,7 @@ bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6948,7 +6948,7 @@ void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct
 {
     obj_anim_image_set_and_seek(sprite, animNum, 0);
     FieldObjectSetDirection(mapObject, direction);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite)
@@ -6963,7 +6963,7 @@ bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8064864(sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -6987,7 +6987,7 @@ bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         mapObject->mapobj_bit_5 = 0;
         return TRUE;
     }
@@ -7006,7 +7006,7 @@ bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         mapObject->mapobj_bit_5 = 0;
         return TRUE;
     }
@@ -7025,7 +7025,7 @@ bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         mapObject->mapobj_bit_5 = 0;
         return TRUE;
     }
@@ -7044,7 +7044,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_8061340(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         mapObject->mapobj_bit_5 = 0;
         return TRUE;
     }
@@ -7058,7 +7058,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
     {
         an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y));
     }
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7069,21 +7069,21 @@ bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite)
     {
         an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)));
     }
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8062170(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_9 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8062180(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_9 = 0;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7100,7 +7100,7 @@ bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7119,7 +7119,7 @@ bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7138,7 +7138,7 @@ bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7157,7 +7157,7 @@ bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7176,7 +7176,7 @@ bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7195,7 +7195,7 @@ bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7214,7 +7214,7 @@ bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7233,7 +7233,7 @@ bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7252,7 +7252,7 @@ bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061358(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7271,7 +7271,7 @@ bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061358(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7290,7 +7290,7 @@ bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061358(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7309,7 +7309,7 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061358(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7330,42 +7330,42 @@ bool8 sub_80625C8(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_80625D8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_25 = 0;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_80625E8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_25 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_80625F8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_12 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8062608(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8062634(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_13 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_13 = 0;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7373,7 +7373,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7381,7 +7381,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7389,7 +7389,7 @@ bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
 {
     FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7404,13 +7404,13 @@ bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite)
     }
     else if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A)
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     else
     {
         sub_812869C(mapObject);
-        sprite->data2 = 1;
+        sprite->data[2] = 1;
         return sub_8062704(mapObject, sprite);
     }
 }
@@ -7419,7 +7419,7 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (sub_81286C4(mapObject))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7428,7 +7428,7 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_8062724(struct MapObject *mapObject, struct Sprite *sprite)
 {
     obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return FALSE;
 }
 
@@ -7437,7 +7437,7 @@ bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8064864(sprite))
     {
         sub_8064820(sprite, 0x20);
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
     }
     return FALSE;
 }
@@ -7448,7 +7448,7 @@ bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8064824(sprite))
     {
         mapObject->mapobj_bit_13 = 1;
-        sprite->data2 = 3;
+        sprite->data[2] = 3;
     }
     return FALSE;
 }
@@ -7456,7 +7456,7 @@ bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_80627A0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     obj_anim_image_set_and_seek(sprite, 1, 0);
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return FALSE;
 }
 
@@ -7465,7 +7465,7 @@ bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8064864(sprite))
     {
         sub_8064820(sprite, 0x20);
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
     }
     return FALSE;
 }
@@ -7476,7 +7476,7 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8064824(sprite))
     {
         mapObject->mapobj_bit_13 = 1;
-        sprite->data2 = 3;
+        sprite->data[2] = 3;
     }
     return FALSE;
 }
@@ -7484,14 +7484,14 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite)
 bool8 sub_806281C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_26 = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
 bool8 sub_806282C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     mapObject->mapobj_bit_26 = 0;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
     return TRUE;
 }
 
@@ -7527,7 +7527,7 @@ bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite)
     if (an_walk_any_2(mapObject, sprite))
     {
         sprite->affineAnimPaused = 1;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7548,7 +7548,7 @@ bool8 sub_8062930(struct MapObject *mapObject, struct Sprite *sprite)
     if (an_walk_any_2(mapObject, sprite))
     {
         sprite->affineAnimPaused = 1;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7560,7 +7560,7 @@ void sub_806295C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     npc_coords_shift_still(mapObject);
     sub_805FE64(mapObject, sprite, sub_805FDD8(direction));
     sprite->animPaused = 1;
-    sprite->data2 = 1;
+    sprite->data[2] = 1;
 }
 
 bool8 sub_806299C(struct MapObject *mapObject, struct Sprite *sprite)
@@ -7679,7 +7679,7 @@ bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7698,7 +7698,7 @@ bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7717,7 +7717,7 @@ bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7736,7 +7736,7 @@ bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7755,7 +7755,7 @@ bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7774,7 +7774,7 @@ bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7793,7 +7793,7 @@ bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7812,7 +7812,7 @@ bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7831,7 +7831,7 @@ bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7850,7 +7850,7 @@ bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7869,7 +7869,7 @@ bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7888,7 +7888,7 @@ bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite)
     if (sub_8061328(mapObject, sprite))
     {
         mapObject->mapobj_bit_22 = 0;
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7937,7 +7937,7 @@ bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7955,7 +7955,7 @@ bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7973,7 +7973,7 @@ bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -7991,7 +7991,7 @@ bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8015,7 +8015,7 @@ bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8033,7 +8033,7 @@ bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8051,7 +8051,7 @@ bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8069,7 +8069,7 @@ bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8094,7 +8094,7 @@ bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8112,7 +8112,7 @@ bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8130,7 +8130,7 @@ bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
@@ -8148,7 +8148,7 @@ bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
     {
-        sprite->data2 = 2;
+        sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
diff --git a/src/field/field_map_obj_helpers.c b/src/field/field_map_obj_helpers.c
index 59e857aae..f1a113d44 100644
--- a/src/field/field_map_obj_helpers.c
+++ b/src/field/field_map_obj_helpers.c
@@ -98,21 +98,21 @@ void Step8(struct Sprite *sprite, u8 dir)
 
 void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
 {
-    sprite->data3 = a2;
-    sprite->data4 = a3;
-    sprite->data5 = 0;
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = 0;
 }
 
 bool8 obj_npc_ministep(struct Sprite *sprite)
 {
-    if (sprite->data5 >= gUnknown_08376194[sprite->data4])
+    if (sprite->data[5] >= gUnknown_08376194[sprite->data[4]])
         return FALSE;
 
-    gUnknown_08376180[sprite->data4][sprite->data5](sprite, sprite->data3);
+    gUnknown_08376180[sprite->data[4]][sprite->data[5]](sprite, sprite->data[3]);
 
-    sprite->data5++;
+    sprite->data[5]++;
 
-    if (sprite->data5 < gUnknown_08376194[sprite->data4])
+    if (sprite->data[5] < gUnknown_08376194[sprite->data[4]])
         return FALSE;
 
     return TRUE;
@@ -120,22 +120,22 @@ bool8 obj_npc_ministep(struct Sprite *sprite)
 
 void sub_806467C(struct Sprite *sprite, u8 a2)
 {
-    sprite->data3 = a2;
-    sprite->data4 = 0;
-    sprite->data5 = 0;
+    sprite->data[3] = a2;
+    sprite->data[4] = 0;
+    sprite->data[5] = 0;
 }
 
 bool8 sub_806468C(struct Sprite *sprite)
 {
-    if (!(sprite->data4 & 1))
+    if (!(sprite->data[4] & 1))
     {
-        Step1(sprite, sprite->data3);
-        sprite->data5++;
+        Step1(sprite, sprite->data[3]);
+        sprite->data[5]++;
     }
 
-    sprite->data4++;
+    sprite->data[4]++;
 
-    if (sprite->data5 > 15)
+    if (sprite->data[5] > 15)
         return TRUE;
     else
         return FALSE;
@@ -148,10 +148,10 @@ s16 sub_80646C8(s16 a1, u8 a2)
 
 void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4)
 {
-    sprite->data3 = a2;
-    sprite->data4 = a3;
-    sprite->data5 = a4;
-    sprite->data6 = 0;
+    sprite->data[3] = a2;
+    sprite->data[4] = a3;
+    sprite->data[5] = a4;
+    sprite->data[6] = 0;
 }
 
 u8 sub_8064704(struct Sprite *sprite)
@@ -165,17 +165,17 @@ u8 sub_8064704(struct Sprite *sprite)
 
     v2 = 0;
 
-    if (sprite->data4)
-        Step1(sprite, sprite->data3);
+    if (sprite->data[4])
+        Step1(sprite, sprite->data[3]);
 
-    sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5);
+    sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
 
-    sprite->data6++;
+    sprite->data[6]++;
 
-    if (sprite->data6 == (v5[sprite->data4] >> 1))
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
         v2 = 1;
 
-    if (sprite->data6 >= v5[sprite->data4])
+    if (sprite->data[6] >= v5[sprite->data[4]])
     {
         sprite->pos2.y = 0;
         v2 = -1;
@@ -195,17 +195,17 @@ u8 sub_806478C(struct Sprite *sprite)
 
     v2 = 0;
 
-    if (sprite->data4 && !(sprite->data6 & 1))
-        Step1(sprite, sprite->data3);
+    if (sprite->data[4] && !(sprite->data[6] & 1))
+        Step1(sprite, sprite->data[3]);
 
-    sprite->pos2.y = sub_80646C8(sprite->data6 >> v6[sprite->data4], sprite->data5);
+    sprite->pos2.y = sub_80646C8(sprite->data[6] >> v6[sprite->data[4]], sprite->data[5]);
 
-    sprite->data6++;
+    sprite->data[6]++;
 
-    if (sprite->data6 == (v5[sprite->data4] >> 1))
+    if (sprite->data[6] == (v5[sprite->data[4]] >> 1))
         v2 = 1;
 
-    if (sprite->data6 >= v5[sprite->data4])
+    if (sprite->data[6] >= v5[sprite->data[4]])
     {
         sprite->pos2.y = 0;
         v2 = -1;
@@ -216,14 +216,14 @@ u8 sub_806478C(struct Sprite *sprite)
 
 void sub_8064820(struct Sprite *sprite, u16 a2)
 {
-    sprite->data3 = a2;
+    sprite->data[3] = a2;
 }
 
 bool8 sub_8064824(struct Sprite *sprite)
 {
-    sprite->data3--;
+    sprite->data[3]--;
 
-    if (sprite->data3 == 0)
+    if (sprite->data[3] == 0)
         return TRUE;
     else
         return FALSE;
@@ -273,7 +273,7 @@ void sub_806487C(struct Sprite *sprite, bool8 invisible)
 
 void sub_8064970(struct Sprite *sprite)
 {
-    SetObjectSubpriorityByZCoord(sprite->data1, sprite, 1);
+    SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
     sub_806487C(sprite, 0);
 }
 
@@ -283,7 +283,7 @@ void sub_8064990(u8 a1, u8 dir)
     for (i = 0; i < MAX_SPRITES; i++)
     {
         struct Sprite *sprite = &gSprites[i];
-        if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data0 == a1)
+        if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data[0] == a1)
         {
             u8 animNum = FieldObjectDirectionToImageAnimId(dir);
             StartSpriteAnim(sprite, animNum);
diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c
index 767753da2..95b8b749b 100644
--- a/src/field/field_tasks.c
+++ b/src/field/field_tasks.c
@@ -197,7 +197,7 @@ const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8
 void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag)
 {
     const struct MetatileOffset *offsetData = sub_80695E0(offsets, MapGridGetMetatileBehaviorAt(x, y));
-    const struct MetatileOffset *offsetData2 = offsetData;
+    const struct MetatileOffset *offsetdata[2] = offsetData;
     if (offsetData != NULL)
     {
         MapGridSetMetatileIdAt(x + offsetData[0].x, y + offsetData[0].y, offsetData[0].tileId);
@@ -205,10 +205,10 @@ void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32
         {
             CurrentMapDrawMetatileAt(x + offsetData[0].x, y + offsetData[0].y);
         }
-        MapGridSetMetatileIdAt(x + offsetData2[1].x, y + offsetData2[1].y, offsetData2[1].tileId);
+        MapGridSetMetatileIdAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y, offsetdata[2][1].tileId);
         if (flag)
         {
-            CurrentMapDrawMetatileAt(x + offsetData2[1].x, y + offsetData2[1].y);
+            CurrentMapDrawMetatileAt(x + offsetdata[2][1].x, y + offsetdata[2][1].y);
         }
     }
 }
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 042655644..acd8b81ff 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1248,8 +1248,8 @@ void sub_807E0A0(void)
 
 void sub_807E0F4(struct Sprite *sprite)
 {
-    sprite->data0 = (sprite->data0 + 1) & 1;
-    if (sprite->data0 != 0)
+    sprite->data[0] = (sprite->data[0] + 1) & 1;
+    if (sprite->data[0] != 0)
         sprite->pos1.x--;
 }
 
@@ -1468,55 +1468,55 @@ void sub_807E4EC(struct Sprite *sprite)
     s32 r4;
     s32 r0;
 
-    if (sprite->data1 == 0)
-        sprite->data1 = 361;
-    randVal = sprite->data1 * 1103515245 + 12345;
-    sprite->data1 = ((randVal & 0x7FFF0000) >> 16) % 600;
+    if (sprite->data[1] == 0)
+        sprite->data[1] = 361;
+    randVal = sprite->data[1] * 1103515245 + 12345;
+    sprite->data[1] = ((randVal & 0x7FFF0000) >> 16) % 600;
 
     r6 = gUnknown_0839AAC4[gUnknown_08396FC4->unknown_6DC][0];
 
-    r4 = sprite->data1 % 30;
-    sprite->data2 = r4 * 8;  // useless assignment
+    r4 = sprite->data[1] % 30;
+    sprite->data[2] = r4 * 8;  // useless assignment
 
-    r0 = sprite->data1 / 30;
-    sprite->data3 = r0 * 8;  // useless assignment
+    r0 = sprite->data[1] / 30;
+    sprite->data[3] = r0 * 8;  // useless assignment
 
-    sprite->data2 = r4;
-    sprite->data2 <<= 7;
+    sprite->data[2] = r4;
+    sprite->data[2] <<= 7;
 
-    sprite->data3 = r0;
-    sprite->data3 <<= 7;
+    sprite->data[3] = r0;
+    sprite->data[3] <<= 7;
 
-    sprite->data2 -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0] * r6;
-    sprite->data3 -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1] * r6;
+    sprite->data[2] -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0] * r6;
+    sprite->data[3] -= gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1] * r6;
 
     StartSpriteAnim(sprite, 0);
-    sprite->data4 = 0;
+    sprite->data[4] = 0;
     sprite->coordOffsetEnabled = FALSE;
-    sprite->data0 = r6;
+    sprite->data[0] = r6;
 }
 
 void sub_807E5C0(struct Sprite *sprite)
 {
-    if (sprite->data4 == 0)
+    if (sprite->data[4] == 0)
     {
-        sprite->data2 += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0];
-        sprite->data3 += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1];
-        sprite->pos1.x = sprite->data2 >> 4;
-        sprite->pos1.y = sprite->data3 >> 4;
+        sprite->data[2] += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][0];
+        sprite->data[3] += gUnknown_0839AABC[gUnknown_08396FC4->unknown_6DC][1];
+        sprite->pos1.x = sprite->data[2] >> 4;
+        sprite->pos1.y = sprite->data[3] >> 4;
 
-        if (sprite->data5 != 0
+        if (sprite->data[5] != 0
          && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248)
          && sprite->pos1.y >= -16 && sprite->pos1.y <= 176)
             sprite->invisible = FALSE;
         else
             sprite->invisible = TRUE;
 
-        sprite->data0--;
-        if (sprite->data0 == 0)
+        sprite->data[0]--;
+        if (sprite->data[0] == 0)
         {
             StartSpriteAnim(sprite, gUnknown_08396FC4->unknown_6DC + 1);
-            sprite->data4 = 1;
+            sprite->data[4] = 1;
             sprite->pos1.x -= gSpriteCoordOffsetX;
             sprite->pos1.y -= gSpriteCoordOffsetY;
             sprite->coordOffsetEnabled = TRUE;
@@ -1531,14 +1531,14 @@ void sub_807E5C0(struct Sprite *sprite)
 
 void sub_807E6C4(struct Sprite *sprite)
 {
-    if (sprite->data0 == 0)
+    if (sprite->data[0] == 0)
     {
         sub_807E4EC(sprite);
         sprite->callback = sub_807E5C0;
     }
     else
     {
-        sprite->data0--;
+        sprite->data[0]--;
     }
 }
 
@@ -1554,13 +1554,13 @@ void sub_807E6F0(struct Sprite *sprite, u16 b)
     {
         while (--r4 != 0xFFFF)
             sub_807E5C0(sprite);
-        sprite->data6 = 0;
+        sprite->data[6] = 0;
     }
     else
     {
-        sprite->data0 = r4 - r8;
+        sprite->data[0] = r4 - r8;
         sprite->invisible = TRUE;
-        sprite->data6 = 1;
+        sprite->data[6] = 1;
     }
 }
 
@@ -1584,10 +1584,10 @@ bool8 sub_807E7B4(void)
       gUnknown_0839AA08[r7].x, gUnknown_0839AA08[r7].y, 78);
     if (spriteId != 64)
     {
-        gSprites[spriteId].data5 = 0;
-        gSprites[spriteId].data1 = r7 * 145;
-        while (gSprites[spriteId].data1 >= 600)
-            gSprites[spriteId].data1 -= 600;
+        gSprites[spriteId].data[5] = 0;
+        gSprites[spriteId].data[1] = r7 * 145;
+        while (gSprites[spriteId].data[1] >= 600)
+            gSprites[spriteId].data[1] -= 600;
         sub_807E4EC(&gSprites[spriteId]);
         sub_807E6F0(&gSprites[spriteId], r7 * 9);
         gSprites[spriteId].invisible = TRUE;
@@ -1606,7 +1606,7 @@ bool8 sub_807E7B4(void)
         {
             if (gUnknown_08396FC4->unknown_0[i] != NULL)
             {
-                if (gUnknown_08396FC4->unknown_0[i]->data6 == 0)
+                if (gUnknown_08396FC4->unknown_0[i]->data[6] == 0)
                     gUnknown_08396FC4->unknown_0[i]->callback = sub_807E5C0;
                 else
                     gUnknown_08396FC4->unknown_0[i]->callback = sub_807E6C4;
@@ -1627,12 +1627,12 @@ bool8 sub_807E8E8(void)
         gUnknown_08396FC4->unknown_6D6 = 0;
         if (gUnknown_08396FC4->unknown_6D8 < gUnknown_08396FC4->unknown_6D9)
         {
-            gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8++]->data5 = 1;
+            gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8++]->data[5] = 1;
         }
         else
         {
             gUnknown_08396FC4->unknown_6D8--;
-            gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->data5 = 0;
+            gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->data[5] = 0;
             gUnknown_08396FC4->unknown_0[gUnknown_08396FC4->unknown_6D8]->invisible = TRUE;
         }
     }
@@ -1739,7 +1739,7 @@ bool8 snowflake_add(void)
 
     if (spriteId == 64)
         return FALSE;
-    gSprites[spriteId].data4 = gUnknown_08396FC4->unknown_6E4;
+    gSprites[spriteId].data[4] = gUnknown_08396FC4->unknown_6E4;
     sub_807EC40(&gSprites[spriteId]);
     gSprites[spriteId].coordOffsetEnabled = TRUE;
     gUnknown_08396FC4->unknown_60[gUnknown_08396FC4->unknown_6E4++] = &gSprites[spriteId];
@@ -1758,21 +1758,21 @@ bool8 snowflake_remove(void)
 
 void sub_807EC40(struct Sprite *sprite)
 {
-    u16 r4 = ((sprite->data4 * 5) & 7) * 30 + (Random() % 30);
+    u16 r4 = ((sprite->data[4] * 5) & 7) * 30 + (Random() % 30);
     u16 r6;
 
     sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
     sprite->pos1.x = r4 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
-    sprite->data0 = sprite->pos1.y * 128;
+    sprite->data[0] = sprite->pos1.y * 128;
     sprite->pos2.x = 0;
     r6 = Random();
-    sprite->data1 = (r6 & 3) * 5 + 64;
-    sprite->data7 = (r6 & 3) * 5 + 64;
+    sprite->data[1] = (r6 & 3) * 5 + 64;
+    sprite->data[7] = (r6 & 3) * 5 + 64;
     StartSpriteAnim(sprite, (r6 & 1) ? 0 : 1);
-    sprite->data3 = 0;
-    sprite->data2 = ((r6 & 3) == 0) ? 2 : 1;
-    sprite->data6 = (r6 & 0x1F) + 210;
-    sprite->data5 = 0;
+    sprite->data[3] = 0;
+    sprite->data[2] = ((r6 & 3) == 0) ? 2 : 1;
+    sprite->data[6] = (r6 & 0x1F) + 210;
+    sprite->data[5] = 0;
 }
 
 void sub_807ECEC(struct Sprite *sprite)
@@ -1782,7 +1782,7 @@ void sub_807ECEC(struct Sprite *sprite)
         sprite->invisible = FALSE;
         sprite->callback = sub_807ED48;
         sprite->pos1.y = 0xFA - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->data0 = sprite->pos1.y * 128;
+        sprite->data[0] = sprite->pos1.y * 128;
         gUnknown_08396FC4->unknown_6E2 = 0;
     }
 }
@@ -1792,10 +1792,10 @@ void sub_807ED48(struct Sprite *sprite)
     s16 r3;
     s16 r2;
 
-    sprite->data0 += sprite->data1;
-    sprite->pos1.y = sprite->data0 >> 7;
-    sprite->data3 = (sprite->data3 + sprite->data2) & 0xFF;
-    sprite->pos2.x = gSineTable[sprite->data3] / 64;
+    sprite->data[0] += sprite->data[1];
+    sprite->pos1.y = sprite->data[0] >> 7;
+    sprite->data[3] = (sprite->data[3] + sprite->data[2]) & 0xFF;
+    sprite->pos2.x = gSineTable[sprite->data[3]] / 64;
 
     r3 = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF;
     if (r3 & 0x100)
@@ -1809,22 +1809,22 @@ void sub_807ED48(struct Sprite *sprite)
     if (r2 > 163 && r2 < 171)
     {
         sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->data0 = sprite->pos1.y * 128;
-        sprite->data5 = 0;
-        sprite->data6 = 220;
+        sprite->data[0] = sprite->pos1.y * 128;
+        sprite->data[5] = 0;
+        sprite->data[6] = 220;
     }
     else if (r2 > 242 && r2 < 250)
     {
         sprite->pos1.y = 163;
-        sprite->data0 = sprite->pos1.y * 128;
-        sprite->data5 = 0;
-        sprite->data6 = 220;
+        sprite->data[0] = sprite->pos1.y * 128;
+        sprite->data[5] = 0;
+        sprite->data[6] = 220;
         sprite->invisible = TRUE;
         sprite->callback = sub_807ECEC;
     }
 
-    sprite->data5++;
-    if (sprite->data5 == sprite->data6)
+    sprite->data[5]++;
+    if (sprite->data[5] == sprite->data[6])
     {
         sub_807EC40(sprite);
         sprite->pos1.y = 250;
@@ -2135,10 +2135,10 @@ bool8 sub_807F5EC(void)
 void sub_807F688(struct Sprite *sprite)
 {
     sprite->pos2.y = (u8)gSpriteCoordOffsetY;
-    sprite->pos1.x = gUnknown_08396FC4->unknown_6EE + 32 + sprite->data0 * 64;
+    sprite->pos1.x = gUnknown_08396FC4->unknown_6EE + 32 + sprite->data[0] * 64;
     if (sprite->pos1.x > 0x10F)
     {
-        sprite->pos1.x = 480 + gUnknown_08396FC4->unknown_6EE - (4 - sprite->data0) * 64;
+        sprite->pos1.x = 480 + gUnknown_08396FC4->unknown_6EE - (4 - sprite->data[0]) * 64;
         sprite->pos1.x &= 0x1FF;
     }
 }
diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index 00cabe5c0..6e7f14a8c 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -136,7 +136,7 @@ bool8 FldEff_CutGrass(void)
     {
         eCutGrassSpriteArray[i] = CreateSprite((struct SpriteTemplate *)&gSpriteTemplate_CutGrass,
         gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0);
-        gSprites[eCutGrassSpriteArray[i]].data2 = 32 * i;
+        gSprites[eCutGrassSpriteArray[i]].data[2] = 32 * i;
     }
     return 0;
 }
@@ -242,9 +242,9 @@ void sub_80A28F4(s16 x, s16 y)
 
 void sub_80A2A48(struct Sprite *sprite)
 {
-    sprite->data0 = 8;
-    sprite->data1 = 0;
-    sprite->data3 = 0;
+    sprite->data[0] = 8;
+    sprite->data[1] = 0;
+    sprite->data[3] = 0;
     sprite->callback = (void *)objc_8097BBC;
 }
 
@@ -253,16 +253,16 @@ void objc_8097BBC(struct Sprite *sprite)
     u16 tempdata;
     u16 tempdata2;
 
-    sprite->pos2.x = Sin(sprite->data2, sprite->data0);
-    sprite->pos2.y = Cos(sprite->data2, sprite->data0);
+    sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]);
+    sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]);
 
-    sprite->data2 = (sprite->data2 + 8) & 0xFF;
-    sprite->data0 += ((tempdata2 = sprite->data3) << 16 >> 18) + 1; // what?
-    sprite->data3 = tempdata2 + 1;
+    sprite->data[2] = (sprite->data[2] + 8) & 0xFF;
+    sprite->data[0] += ((tempdata2 = sprite->data[3]) << 16 >> 18) + 1; // what?
+    sprite->data[3] = tempdata2 + 1;
 
-    tempdata = sprite->data1;
+    tempdata = sprite->data[1];
     if((s16)tempdata != 28) // done rotating the grass, execute clean up function
-        sprite->data1++;
+        sprite->data[1]++;
     else
         sprite->callback = (void *)sub_80A2AB8;
 }
diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c
index b2c3d9bd1..c2a315233 100644
--- a/src/field/fldeff_softboiled.c
+++ b/src/field/fldeff_softboiled.c
@@ -82,8 +82,8 @@ static void sub_8133D50(u8 taskId) {
     struct Sprite *sprites = gSprites;
 
 
-    unk1 = sprites[EWRAM_1000.unk1].data0;
-    unk2 = sprites[EWRAM_1000.unk2].data0;
+    unk1 = sprites[EWRAM_1000.unk1].data[0];
+    unk2 = sprites[EWRAM_1000.unk2].data[0];
 
     if (unk1 > 5 || unk2 > 5)
     {
@@ -91,7 +91,7 @@ static void sub_8133D50(u8 taskId) {
         return;
     }
 
-    EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data0];
+    EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]];
     hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
 
     if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp)
@@ -102,7 +102,7 @@ static void sub_8133D50(u8 taskId) {
 
     PlaySE(SE_KAIFUKU);
 
-    EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0;
+    EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0];
 
     pokemon = &gPlayerParty[EWRAM_1C000.unk5];
     EWRAM_1C000.unk0 = pokemon;
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 09542cc6d..67362d5f3 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -4080,11 +4080,11 @@ static const struct CompressedSpritePalette sBagSpritePalette = {gBagPalette, 30
 static void sub_80A7998(struct Sprite *sprite)
 {
     sprite->animNum = 0;
-    sprite->data0 = 0;
-    sprite->data1 = 0;
-    sprite->data2 = 0;
-    sprite->data3 = 0;
-    sprite->data4 = 0;
+    sprite->data[0] = 0;
+    sprite->data[1] = 0;
+    sprite->data[2] = 0;
+    sprite->data[3] = 0;
+    sprite->data[4] = 0;
     sprite->callback = sub_80A79B4;
 }
 
@@ -4098,7 +4098,7 @@ static void sub_80A79B4(struct Sprite *sprite)
 
 static void sub_80A79EC(struct Sprite *sprite)
 {
-    switch (sprite->data3)
+    switch (sprite->data[3])
     {
     case 0:
         if (gUnknown_0203855B != 6)
@@ -4112,26 +4112,26 @@ static void sub_80A79EC(struct Sprite *sprite)
             sprite->animBeginning = TRUE;
             sprite->animNum = 0;
             sprite->pos1.y -= 4;
-            sprite->data0 = 4;
-            sprite->data3 = 1;
+            sprite->data[0] = 4;
+            sprite->data[3] = 1;
             sub_80A7AE4(sprite);
         }
         break;
     case 1:
-        if (sprite->data0 != 0)
+        if (sprite->data[0] != 0)
         {
-            if (sprite->data1 != 0)
+            if (sprite->data[1] != 0)
             {
                 sprite->pos1.y++;
-                sprite->data0--;
+                sprite->data[0]--;
             }
-            sprite->data1 = (sprite->data1 + 1) & 1;
+            sprite->data[1] = (sprite->data[1] + 1) & 1;
         }
         else
         {
             gUnknown_0203855B = -1;
-            sprite->data1 = 0;
-            sprite->data3 = 0;
+            sprite->data[1] = 0;
+            sprite->data[3] = 0;
         }
         break;
     }
@@ -4139,17 +4139,17 @@ static void sub_80A79EC(struct Sprite *sprite)
 
 static void sub_80A7A94(struct Sprite *sprite)
 {
-    switch (sprite->data4)
+    switch (sprite->data[4])
     {
     case 0:
         sprite->oam.affineMode = 1;
         sprite->affineAnims = sBagSpriteAffineAnimTable;
         InitSpriteAffineAnim(sprite);
-        sprite->data4 = 1;
+        sprite->data[4] = 1;
         break;
     case 1:
-        sprite->data2++;
-        if (sprite->data2 == 12)
+        sprite->data[2]++;
+        if (sprite->data[2] == 12)
             sub_80A7AE4(sprite);
         break;
     }
@@ -4159,8 +4159,8 @@ static void sub_80A7AE4(struct Sprite *sprite)
 {
     gUnknown_0203855C = 0;
     sprite->oam.affineMode = 0;
-    sprite->data2 = 0;
-    sprite->data4 = 0;
+    sprite->data[2] = 0;
+    sprite->data[4] = 0;
     FreeOamMatrix(sprite->oam.matrixNum);
 }
 
@@ -4228,45 +4228,45 @@ static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8}
 
 static void sub_80A7B28(struct Sprite *sprite)
 {
-    sprite->data3 = 0;
-    sprite->data0 = 0;
+    sprite->data[3] = 0;
+    sprite->data[0] = 0;
     sub_80A7B6C(sprite);
     sprite->callback = sub_80A7B6C;
 }
 
 static void sub_80A7B48(struct Sprite *sprite)
 {
-    sprite->centerToCornerVecX = sprite->data5 - ((sprite->data0 + 1) & 1);
-    sprite->centerToCornerVecY = sprite->data6 - ((sprite->data0 + 1) & 1);
+    sprite->centerToCornerVecX = sprite->data[5] - ((sprite->data[0] + 1) & 1);
+    sprite->centerToCornerVecY = sprite->data[6] - ((sprite->data[0] + 1) & 1);
 }
 
 static void sub_80A7B6C(struct Sprite *sprite)
 {
-    if (sprite->data7 != 0)
+    if (sprite->data[7] != 0)
     {
-        switch (sprite->data3)
+        switch (sprite->data[3])
         {
         case 0:
             sprite->oam.affineMode = 1;
-            if (sprite->data7 == 1)
+            if (sprite->data[7] == 1)
                 sprite->affineAnims = gSpriteAffineAnimTable_83C1D20;
             else
                 sprite->affineAnims = gSpriteAffineAnimTable_83C1D20 + 1;
             InitSpriteAffineAnim(sprite);
-            sprite->data3 = 1;
-            sprite->data5 = sprite->centerToCornerVecX;
-            sprite->data6 = sprite->centerToCornerVecY;
+            sprite->data[3] = 1;
+            sprite->data[5] = sprite->centerToCornerVecX;
+            sprite->data[6] = sprite->centerToCornerVecY;
             sub_80A7B48(sprite);
             break;
         case 1:
-            sprite->data0++;
+            sprite->data[0]++;
             sub_80A7B48(sprite);
-            if (sprite->data0 == 32)
+            if (sprite->data[0] == 32)
             {
-                sprite->data0 = 0;
-                sprite->data3 = 0;
-                sprite->centerToCornerVecX = sprite->data5;
-                sprite->centerToCornerVecY = sprite->data6;
+                sprite->data[0] = 0;
+                sprite->data[3] = 0;
+                sprite->centerToCornerVecX = sprite->data[5];
+                sprite->centerToCornerVecY = sprite->data[6];
                 FreeOamMatrix(sprite->oam.matrixNum);
                 sprite->oam.affineMode = 0;
                 sprite->callback = SpriteCallbackDummy;
@@ -4291,7 +4291,7 @@ static void CreateBagPokeballSprite(u8 a)
 {
     LoadSpritePalette(&sPokeballSpritePalette);
     sPokeballSpriteId = CreateSprite(&sPokeballSpriteTemplate, 16, 88, 0);
-    gSprites[sPokeballSpriteId].data7 = a;
+    gSprites[sPokeballSpriteId].data[7] = a;
 }
 
 static void sub_80A7C64(void)
diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index 14e823355..8e13e5546 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/menu_helpers.c
@@ -405,15 +405,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y)
         if (gUnknown_020388C0[0] == 0xFF)
         {
             gUnknown_020388C0[0] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0);
-            gSprites[gUnknown_020388C0[0]].data2 = -1;
+            gSprites[gUnknown_020388C0[0]].data[2] = -1;
             if (gUnknown_020388C0[1] != 0xFF)
             {
                 gSprites[gUnknown_020388C0[0]].pos2.y = gSprites[gUnknown_020388C0[1]].pos2.y * -1;
-                gSprites[gUnknown_020388C0[0]].data3 = gSprites[gUnknown_020388C0[1]].data3;
+                gSprites[gUnknown_020388C0[0]].data[3] = gSprites[gUnknown_020388C0[1]].data[3];
             }
             else
             {
-                gSprites[gUnknown_020388C0[0]].data3 = 0;
+                gSprites[gUnknown_020388C0[0]].data[3] = 0;
             }
         }
         break;
@@ -422,15 +422,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y)
         if (gUnknown_020388C0[1] == 0xFF)
         {
             gUnknown_020388C0[1] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0);
-            gSprites[gUnknown_020388C0[1]].data2 = 1;
+            gSprites[gUnknown_020388C0[1]].data[2] = 1;
             if (gUnknown_020388C0[0] != 0xFF)
             {
                 gSprites[gUnknown_020388C0[1]].pos2.y = gSprites[gUnknown_020388C0[0]].pos2.y * -1;
-                gSprites[gUnknown_020388C0[1]].data3 = gSprites[gUnknown_020388C0[0]].data3;
+                gSprites[gUnknown_020388C0[1]].data[3] = gSprites[gUnknown_020388C0[0]].data[3];
             }
             else
             {
-                gSprites[gUnknown_020388C0[1]].data3 = 0;
+                gSprites[gUnknown_020388C0[1]].data[3] = 0;
             }
         }
         break;
@@ -439,15 +439,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y)
         if (gUnknown_020388C0[2] == 0xFF)
         {
             gUnknown_020388C0[2] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0);
-            gSprites[gUnknown_020388C0[2]].data0 = -1;
+            gSprites[gUnknown_020388C0[2]].data[0] = -1;
             if (gUnknown_020388C0[3] != 0xFF)
             {
                 gSprites[gUnknown_020388C0[2]].pos2.x = gSprites[gUnknown_020388C0[3]].pos2.x * -1;
-                gSprites[gUnknown_020388C0[2]].data1 = gSprites[gUnknown_020388C0[3]].data1;
+                gSprites[gUnknown_020388C0[2]].data[1] = gSprites[gUnknown_020388C0[3]].data[1];
             }
             else
             {
-                gSprites[gUnknown_020388C0[2]].data1 = 0;
+                gSprites[gUnknown_020388C0[2]].data[1] = 0;
             }
         }
         break;
@@ -456,15 +456,15 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y)
         if (gUnknown_020388C0[3] == 0xFF)
         {
             gUnknown_020388C0[3] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0);
-            gSprites[gUnknown_020388C0[3]].data0 = 1;
+            gSprites[gUnknown_020388C0[3]].data[0] = 1;
             if (gUnknown_020388C0[2] != 0xFF)
             {
                 gSprites[gUnknown_020388C0[3]].pos2.x = gSprites[gUnknown_020388C0[2]].pos2.x * -1;
-                gSprites[gUnknown_020388C0[3]].data1 = gSprites[gUnknown_020388C0[2]].data1;
+                gSprites[gUnknown_020388C0[3]].data[1] = gSprites[gUnknown_020388C0[2]].data[1];
             }
             else
             {
-                gSprites[gUnknown_020388C0[3]].data1 = 0;
+                gSprites[gUnknown_020388C0[3]].data[1] = 0;
             }
         }
         break;
@@ -502,23 +502,23 @@ void BuyMenuFreeMemory(void)
 
 static void sub_80F9834(struct Sprite *sprite)
 {
-    if (sprite->data1 == 0)
+    if (sprite->data[1] == 0)
     {
-        sprite->pos2.x += sprite->data0;
+        sprite->pos2.x += sprite->data[0];
     }
-    if (sprite->data3 == 0)
+    if (sprite->data[3] == 0)
     {
-        sprite->pos2.y += sprite->data2;
+        sprite->pos2.y += sprite->data[2];
     }
-    sprite->data1++;
-    sprite->data3++;
-    if (sprite->data1 > 2)
+    sprite->data[1]++;
+    sprite->data[3]++;
+    if (sprite->data[1] > 2)
     {
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
     }
-    if (sprite->data3 > 2)
+    if (sprite->data[3] > 2)
     {
-        sprite->data3 = 0;
+        sprite->data[3] = 0;
     }
     if (sprite->pos2.x == 8 || sprite->pos2.x == -8)
     {
@@ -552,8 +552,8 @@ static void sub_80F9914(u8 id)
     {
         gSprites[gUnknown_020388C0[id]].pos2.x = 0;
         gSprites[gUnknown_020388C0[id]].pos2.y = 0;
-        gSprites[gUnknown_020388C0[id]].data1 = 0;
-        gSprites[gUnknown_020388C0[id]].data3 = 0;
+        gSprites[gUnknown_020388C0[id]].data[1] = 0;
+        gSprites[gUnknown_020388C0[id]].data[3] = 0;
     }
 }
 
diff --git a/src/field/overworld.c b/src/field/overworld.c
index d6f255409..59aac5c33 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -2648,14 +2648,14 @@ void CreateLinkPlayerSprite(u8 linkPlayerId)
         mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0);
         sprite = &gSprites[mapObj->spriteId];
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data0 = linkPlayerId;
+        sprite->data[0] = linkPlayerId;
         mapObj->mapobj_bit_2 = 0;
     }
 }
 
 void SpriteCB_LinkPlayer(struct Sprite *sprite)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data0];
+    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]];
     struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId];
     sprite->pos1.x = mapObj->coords1.x;
     sprite->pos1.y = mapObj->coords1.y;
@@ -2668,7 +2668,7 @@ void SpriteCB_LinkPlayer(struct Sprite *sprite)
     sub_806487C(sprite, 0);
     if (mapObj->mapobj_bit_2)
     {
-        sprite->invisible = ((sprite->data7 & 4) >> 2);
-        sprite->data7++;
+        sprite->invisible = ((sprite->data[7] & 4) >> 2);
+        sprite->data[7]++;
     }
 }
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 42bb66f6f..a8620570b 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -1422,7 +1422,7 @@ u16 HandleDefaultPartyMenuInput(u8 taskId)
 
         if (menuDirectionPressed == 0)
         {
-            if ((gMain.newKeys & A_BUTTON) && gSprites[sub_806CA00(taskId)].data0 == 7)
+            if ((gMain.newKeys & A_BUTTON) && gSprites[sub_806CA00(taskId)].data[0] == 7)
             {
                 // Selected "CANCEL"
                 return B_BUTTON;
@@ -1595,7 +1595,7 @@ u16 HandleBattleTowerPartyMenuInput(u8 taskId)
         {
             if (gMain.newKeys & A_BUTTON)
             {
-                if (gSprites[sub_806CA00(taskId)].data0 == 7)
+                if (gSprites[sub_806CA00(taskId)].data[0] == 7)
                 {
                     return B_BUTTON;
                 }
@@ -1629,7 +1629,7 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed)
 {
     bool8 isLinkDoubleBattle;
     u8 spriteId = sub_806CA00(taskId);
-    u8 menuIndex = gSprites[spriteId].data0;
+    u8 menuIndex = gSprites[spriteId].data[0];
 
     UpdateMonIconFrame_806DA44(taskId, menuIndex, 0);
     
@@ -1645,17 +1645,17 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed)
 
         ChangeLinkDoubleBattlePartyMenuSelection(spriteId, menuIndex, directionPressed);
 
-        if (gSprites[spriteId].data0 == 0 || gSprites[spriteId].data0 == 2 || gSprites[spriteId].data0 == 3)
-            sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 3, 1);
-        if (gSprites[spriteId].data0 == 1 || gSprites[spriteId].data0 == 4 || gSprites[spriteId].data0 == 5)
-                sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 4, 1);
-        if (gSprites[spriteId].data0 == 7)
+        if (gSprites[spriteId].data[0] == 0 || gSprites[spriteId].data[0] == 2 || gSprites[spriteId].data[0] == 3)
+            sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 3, 1);
+        if (gSprites[spriteId].data[0] == 1 || gSprites[spriteId].data[0] == 4 || gSprites[spriteId].data[0] == 5)
+                sub_806BF24(&gUnknown_083769C0[gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 4, 1);
+        if (gSprites[spriteId].data[0] == 7)
             sub_806BBEC(2);
 
         ewram1B000.unk261 = 2;
 
-        gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data0].x;
-        gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data0].y;
+        gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].x;
+        gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_LINK_DOUBLE_BATTLE][gSprites[spriteId].data[0]].y;
     }
     else
     {
@@ -1679,9 +1679,9 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed)
             ChangeDoubleBattlePartyMenuSelection(spriteId, menuIndex, directionPressed);
         }
 
-        if (gSprites[spriteId].data0 < PARTY_SIZE)
+        if (gSprites[spriteId].data[0] < PARTY_SIZE)
         {
-            sub_806BF24(&gUnknown_083769A8[isDoubleBattle * 12 + gSprites[spriteId].data0 * 2], gSprites[spriteId].data0, 3, 1);
+            sub_806BF24(&gUnknown_083769A8[isDoubleBattle * 12 + gSprites[spriteId].data[0] * 2], gSprites[spriteId].data[0], 3, 1);
         }
         else
         {
@@ -1690,13 +1690,13 @@ void ChangePartyMenuSelection(u8 taskId, s8 directionPressed)
 
         ewram1B000.unk261 = 2;
 
-        gSprites[spriteId].pos1.x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data0].x;
-        gSprites[spriteId].pos1.y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data0].y;
+        gSprites[spriteId].pos1.x = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].x;
+        gSprites[spriteId].pos1.y = gUnknown_083768B8[isDoubleBattle][gSprites[spriteId].data[0]].y;
     }
 
-    UpdateMonIconFrame_806DA44(taskId, gSprites[spriteId].data0, 1);
+    UpdateMonIconFrame_806DA44(taskId, gSprites[spriteId].data[0], 1);
 
-    if (menuIndex != gSprites[spriteId].data0)
+    if (menuIndex != gSprites[spriteId].data[0])
     {
         PlaySE(5);
     }
@@ -1710,47 +1710,47 @@ void ChangeDefaultPartyMenuSelection(u8 spriteId, u8 menuIndex, s8 directionPres
     switch (menuMovement)
     {
     case 2: // no movement
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 1: // moving up
         if (menuIndex == 0) {
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         } else if (menuIndex == 7) {
-            gSprites[spriteId].data0 = gPlayerPartyCount - 1;
+            gSprites[spriteId].data[0] = gPlayerPartyCount - 1;
         } else {
             s8 diff = directionPressed;
-            gSprites[spriteId].data0 += diff;
+            gSprites[spriteId].data[0] += diff;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 3: // moving down
         if (menuIndex == gPlayerPartyCount - 1) {
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         } else if (menuIndex == 7) {
-            gSprites[spriteId].data0 = 0;
+            gSprites[spriteId].data[0] = 0;
         } else {
             s8 diff = directionPressed;
-            gSprites[spriteId].data0 += diff;
+            gSprites[spriteId].data[0] += diff;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 4: // moving right
         if (gPlayerPartyCount > 1 && menuIndex == 0)
         {
-            if (gSprites[spriteId].data1 == 0)
-                gSprites[spriteId].data1 = 1;
+            if (gSprites[spriteId].data[1] == 0)
+                gSprites[spriteId].data[1] = 1;
 
-            gSprites[spriteId].data0 = gSprites[spriteId].data1;
+            gSprites[spriteId].data[0] = gSprites[spriteId].data[1];
         }
         break;
     case 0: // moving left
         // Only move the selection to the left side if one of the mons in the right-hand column are currently selected
         nextIndex = menuIndex - 1;
         if (nextIndex <= 4) {
-            gSprites[spriteId].data0 = 0;
-            gSprites[spriteId].data1 = menuIndex;
+            gSprites[spriteId].data[0] = 0;
+            gSprites[spriteId].data[1] = menuIndex;
         }
         break;
     }
@@ -1764,62 +1764,62 @@ void ChangeDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 directio
     switch(menuMovement)
     {
     case 2: // no movement
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 3: // moving down
         if (menuIndex == 7) {
-            gSprites[spriteId].data0 = 0;
+            gSprites[spriteId].data[0] = 0;
         } else if (menuIndex == gPlayerPartyCount - 1) {
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         } else {
             s8 diff = directionPressed;
-            gSprites[spriteId].data0 += diff;
+            gSprites[spriteId].data[0] += diff;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 1: // moving up
         if (menuIndex == 0) {
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         } else if (menuIndex == 7) {
-            gSprites[spriteId].data0 = gPlayerPartyCount - 1;
+            gSprites[spriteId].data[0] = gPlayerPartyCount - 1;
         } else {
             s8 diff = directionPressed;
-            gSprites[spriteId].data0 += diff;
+            gSprites[spriteId].data[0] += diff;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 4: // moving right
         if (menuIndex == 0) {
             if (gPlayerPartyCount > 2) {
-                u16 var1 = gSprites[spriteId].data1 - 2;
+                u16 var1 = gSprites[spriteId].data[1] - 2;
                 if (var1 > 1)
-                    gSprites[spriteId].data0 = 2;
+                    gSprites[spriteId].data[0] = 2;
                 else
-                    gSprites[spriteId].data0 = gSprites[spriteId].data1;
+                    gSprites[spriteId].data[0] = gSprites[spriteId].data[1];
             }
         }
         else if (menuIndex == 1) {
             if (gPlayerPartyCount > 4) {
-                u16 var1 = gSprites[spriteId].data1 - 4;
+                u16 var1 = gSprites[spriteId].data[1] - 4;
                 if (var1 <= 1)
-                    gSprites[spriteId].data0 = gSprites[spriteId].data1;
+                    gSprites[spriteId].data[0] = gSprites[spriteId].data[1];
                 else
-                    gSprites[spriteId].data0 = 4;
+                    gSprites[spriteId].data[0] = 4;
             }
         }
         break;
     case 0: // moving left
         var1 = menuIndex - 2;
         if (var1 <= 1) {
-            gSprites[spriteId].data0 = 0;
-            gSprites[spriteId].data1 = menuIndex;
+            gSprites[spriteId].data[0] = 0;
+            gSprites[spriteId].data[1] = menuIndex;
         } else {
             u8 var2 = menuIndex - 4;
             if (var2 <= 1) {
-                gSprites[spriteId].data0 = 1;
-                gSprites[spriteId].data1 = menuIndex;
+                gSprites[spriteId].data[0] = 1;
+                gSprites[spriteId].data[1] = menuIndex;
             }
         }
         break;
@@ -1837,62 +1837,62 @@ void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 dire
     switch (menuMovement)
     {
     case 2: // no movement
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 3: // moving down
         if (menuIndex == 7) {
-            gSprites[spriteId].data0 = 0;
+            gSprites[spriteId].data[0] = 0;
         } else {
             while (menuIndex != PARTY_SIZE - 1) {
                 menuIndex++;
                 if (GetMonData(&gPlayerParty[menuIndex], MON_DATA_SPECIES))
                 {
-                    gSprites[spriteId].data0 = menuIndex;
-                    gSprites[spriteId].data1 = 0;
+                    gSprites[spriteId].data[0] = menuIndex;
+                    gSprites[spriteId].data[1] = 0;
                     return;
                 }
             }
 
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 1: // moving up
         while (menuIndex != 0) {
             menuIndex--;
             if (menuIndex != PARTY_SIZE && GetMonData(gPlayerParty[menuIndex], MON_DATA_SPECIES))
             {
-                gSprites[spriteId].data0 = menuIndex;
-                gSprites[spriteId].data1 = 0;
+                gSprites[spriteId].data[0] = menuIndex;
+                gSprites[spriteId].data[1] = 0;
                 return;
             }
         }
 
-        gSprites[spriteId].data0 = 7;
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[0] = 7;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 4: // moving right
         if (menuIndex == 0) {
-            var1 = gSprites[spriteId].data1 - 2;
+            var1 = gSprites[spriteId].data[1] - 2;
             if (var1 > 1) {
                 if (GetMonData(&gPlayerParty[2], MON_DATA_SPECIES)) {
-                    gSprites[spriteId].data0 = 2;
+                    gSprites[spriteId].data[0] = 2;
                 } else if (GetMonData(&gPlayerParty[3], MON_DATA_SPECIES)) {
-                    gSprites[spriteId].data0 = 3;
+                    gSprites[spriteId].data[0] = 3;
                 }
             } else {
-                gSprites[spriteId].data0 = 1;
+                gSprites[spriteId].data[0] = 1;
             }
         } else if (menuIndex == 1) {
-            var1 = gSprites[spriteId].data1 - 4;
+            var1 = gSprites[spriteId].data[1] - 4;
             if (var1 <= 1) {
-                gSprites[spriteId].data0 = gSprites[spriteId].data1;
+                gSprites[spriteId].data[0] = gSprites[spriteId].data[1];
             } else {
                 if (GetMonData(&gPlayerParty[4], MON_DATA_SPECIES)) {
-                    gSprites[spriteId].data0 = 4;
+                    gSprites[spriteId].data[0] = 4;
                 } else if (GetMonData(&gPlayerParty[5], MON_DATA_SPECIES)) {
-                    gSprites[spriteId].data0 = 5;
+                    gSprites[spriteId].data[0] = 5;
                 }
             }
         }
@@ -1900,13 +1900,13 @@ void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 dire
     case 0: // moving left
         var2 = menuIndex - 2;
         if (var2 <= 1) {
-            gSprites[spriteId].data0 = 0;
-            gSprites[spriteId].data1 = menuIndex;
+            gSprites[spriteId].data[0] = 0;
+            gSprites[spriteId].data[1] = menuIndex;
         } else {
             var2 = menuIndex - 4;
             if (var2 <= 1) {
-                gSprites[spriteId].data0 = 1;
-                gSprites[spriteId].data1 = menuIndex;
+                gSprites[spriteId].data[0] = 1;
+                gSprites[spriteId].data[1] = menuIndex;
             }
         }
 
@@ -2165,7 +2165,7 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed)
     u8 newMenuIndex3;
     s8 menuMovement;
     u8 spriteId = sub_806CA00(taskId);
-    u8 menuIndex = gSprites[spriteId].data0;
+    u8 menuIndex = gSprites[spriteId].data[0];
 
     UpdateMonIconFrame_806DA44(taskId, menuIndex, 0);
 
@@ -2187,60 +2187,60 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed)
     switch (menuMovement)
     {
     case 2: // no movement
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 1: // moving up
         if (menuIndex == 0) {
-            gSprites[spriteId].data0 = 7;
+            gSprites[spriteId].data[0] = 7;
         } else if (menuIndex == PARTY_SIZE) {
-            gSprites[spriteId].data0 = gPlayerPartyCount - 1;
+            gSprites[spriteId].data[0] = gPlayerPartyCount - 1;
         } else {
-            gSprites[spriteId].data0 += directionPressed;
+            gSprites[spriteId].data[0] += directionPressed;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 3: // moving down
         if (menuIndex == gPlayerPartyCount - 1) {
-            gSprites[spriteId].data0 = 6;
+            gSprites[spriteId].data[0] = 6;
         } else if (menuIndex == 7) {
-            gSprites[spriteId].data0 = 0;
+            gSprites[spriteId].data[0] = 0;
         } else {
-            gSprites[spriteId].data0 += directionPressed;
+            gSprites[spriteId].data[0] += directionPressed;
         }
 
-        gSprites[spriteId].data1 = 0;
+        gSprites[spriteId].data[1] = 0;
         break;
     case 4: // moving right
         if (gPlayerPartyCount > 1 && menuIndex == 0)
         {
-            if (gSprites[spriteId].data1 == 0) {
-                gSprites[spriteId].data1 = 1;
+            if (gSprites[spriteId].data[1] == 0) {
+                gSprites[spriteId].data[1] = 1;
             }
 
-            gSprites[spriteId].data0 = gSprites[spriteId].data1;
+            gSprites[spriteId].data[0] = gSprites[spriteId].data[1];
         }
         break;
     case 0: // moving left
         newMenuIndex3 = menuIndex - 1;
         if (newMenuIndex3 <= 4)
         {
-            gSprites[spriteId].data0 = 0;
-            gSprites[spriteId].data1 = menuIndex;
+            gSprites[spriteId].data[0] = 0;
+            gSprites[spriteId].data[1] = menuIndex;
         }
         break;
     }
     
-    gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data0].x;
-    gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data0].y;
+    gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].x;
+    gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][gSprites[spriteId].data[0]].y;
 
 
-    newMenuIndex = gSprites[spriteId].data0;
-    if (gSprites[spriteId].data0 < PARTY_SIZE)
+    newMenuIndex = gSprites[spriteId].data[0];
+    if (gSprites[spriteId].data[0] < PARTY_SIZE)
     {
-        sub_806BF24(&gUnknown_083769A8[gSprites[spriteId].data0 * 2], newMenuIndex, 3, 1);
+        sub_806BF24(&gUnknown_083769A8[gSprites[spriteId].data[0] * 2], newMenuIndex, 3, 1);
     }
-    else if (gSprites[spriteId].data0 == PARTY_SIZE)
+    else if (gSprites[spriteId].data[0] == PARTY_SIZE)
     {
         sub_806BB9C(2);
     }
@@ -2251,10 +2251,10 @@ void ChangeBattleTowerPartyMenuSelection(u8 taskId, s8 directionPressed)
 
     ewram1B000.unk261 = 2;
 
-    newMenuIndex2 = gSprites[spriteId].data0;
+    newMenuIndex2 = gSprites[spriteId].data[0];
     UpdateMonIconFrame_806DA44(taskId, newMenuIndex2, 1);
 
-    if (menuIndex != gSprites[spriteId].data0)
+    if (menuIndex != gSprites[spriteId].data[0])
     {
         PlaySE(5);
     }
@@ -2265,7 +2265,7 @@ void SelectBattleTowerOKButton(u8 taskId)
 {
     u8 spriteId = sub_806CA00(taskId);
 
-    u8 menuIndex = gSprites[spriteId].data0;
+    u8 menuIndex = gSprites[spriteId].data[0];
     if (menuIndex != 6)
     {
         UpdateMonIconFrame_806DA44(taskId, menuIndex, 0);
@@ -2279,8 +2279,8 @@ void SelectBattleTowerOKButton(u8 taskId)
             sub_806BBEC(1);
         }
 
-        gSprites[spriteId].data1 = 0;
-        gSprites[spriteId].data0 = 6;
+        gSprites[spriteId].data[1] = 0;
+        gSprites[spriteId].data[0] = 6;
         gSprites[spriteId].pos1.x = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].x;
         gSprites[spriteId].pos1.y = gUnknown_083768B8[PARTY_MENU_LAYOUT_STANDARD][6].y;
 
@@ -2293,8 +2293,8 @@ void SelectBattleTowerOKButton(u8 taskId)
 
 void sub_806C92C(u8 spriteId)
 {
-    u8 menuIndex1 = gSprites[spriteId].data0;
-    u8 menuIndex2 = gSprites[spriteId].data1;
+    u8 menuIndex1 = gSprites[spriteId].data[0];
+    u8 menuIndex2 = gSprites[spriteId].data[1];
 
     if (!IsDoubleBattle())
     {
@@ -2319,14 +2319,14 @@ void sub_806C92C(u8 spriteId)
         }
     }
 
-    gSprites[spriteId].data1 = menuIndex2;
+    gSprites[spriteId].data[1] = menuIndex2;
 }
 
 void sub_806C994(u8 taskId, u8 b)
 {
     u8 spriteId = sub_806CA00(taskId);
 
-    gSprites[spriteId].data0 = b;
+    gSprites[spriteId].data[0] = b;
     sub_806C92C(spriteId);
 }
 
@@ -2336,7 +2336,7 @@ void sub_806C9C4(u8 taskId, u8 spriteId)
 
     gSprites[spriteId].pos1.x = gSprites[spriteId2].pos1.x;
     gSprites[spriteId].pos1.y = gSprites[spriteId2].pos1.y;
-    gSprites[spriteId].data0 = gSprites[spriteId2].data0;
+    gSprites[spriteId].data[0] = gSprites[spriteId2].data[0];
 }
 
 u8 sub_806CA00(u8 taskId)
@@ -2353,7 +2353,7 @@ void sub_806CA18(u8 taskId, u8 b)
 u8 sub_806CA38(u8 taskId)
 {
     u8 spriteId = sub_806CA00(taskId);
-    return gSprites[spriteId].data0;
+    return gSprites[spriteId].data[0];
 }
 
 void SetupDefaultPartyMenuSwitchPokemon(u8 taskId)
@@ -2369,7 +2369,7 @@ void SetupDefaultPartyMenuSwitchPokemon(u8 taskId)
 
     PrintPartyMenuPromptText(ewram1B000_alt.unk272, 0);
 
-    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data0 * 2], gSprites[ewram01000.unk1].data0, 6, 0);
+    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 6, 0);
     ewram1B000.unk261 = 2;
 }
 
@@ -2381,13 +2381,13 @@ void ChangePartyMenuSwitchPokemonSelection(u8 taskId, s16 menuDirectionPressed)
 
     ChangePartyMenuSelection(taskId, menuDirectionPressed);
 
-    if (sprite1->data0 != sprite2->data0)
+    if (sprite1->data[0] != sprite2->data[0])
     {
-        sub_806BF24(&gUnknown_083769A8[sprite1->data0 * 2], sprite1->data0, 6, 1);
+        sub_806BF24(&gUnknown_083769A8[sprite1->data[0] * 2], sprite1->data[0], 6, 1);
     }
     else
     {
-        sub_806BF24(&gUnknown_083769A8[sprite1->data0 * 2], sprite1->data0, 6, 0);
+        sub_806BF24(&gUnknown_083769A8[sprite1->data[0] * 2], sprite1->data[0], 6, 0);
     }
 }
 
@@ -2434,15 +2434,15 @@ void sub_806CC2C(u8 taskId)
 
 void sub_806CC74(u8 taskId)
 {
-    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk2].data0 * 2], gSprites[ewram01000.unk2].data0, 3, 1);
-    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data0 * 2], gSprites[ewram01000.unk1].data0, 3, 0);
+    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk2].data[0] * 2], gSprites[ewram01000.unk2].data[0], 3, 1);
+    sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 3, 0);
     sub_806CC2C(taskId);
 }
 
 void sub_806CCE4()
 {
-    u8 monIndex1 = gSprites[ewram01000.unk1].data0;
-    u8 monIndex2 = gSprites[ewram01000.unk2].data0;
+    u8 monIndex1 = gSprites[ewram01000.unk1].data[0];
+    u8 monIndex2 = gSprites[ewram01000.unk2].data[0];
 
     if (monIndex1 <= 5)
     {
@@ -2463,8 +2463,8 @@ void sub_806CD44(u8 taskId)
 
 void sub_806CD5C(u8 taskId)
 {
-    u8 monIndex1 = gSprites[ewram01000.unk1].data0;
-    u8 monIndex2 = gSprites[ewram01000.unk2].data0;
+    u8 monIndex1 = gSprites[ewram01000.unk1].data[0];
+    u8 monIndex2 = gSprites[ewram01000.unk2].data[0];
 
     if (monIndex1 == monIndex2 || monIndex1 == 7 || monIndex2 == 7)
     {
@@ -2494,8 +2494,8 @@ void sub_806CD5C(u8 taskId)
         var1 = ewram01000.unk5;
         if (!var1)
         {
-            gSprites[ewram01000.unk3].data0 = -8;
-            gSprites[ewram01000.unk3].data2 = -0xA8;
+            gSprites[ewram01000.unk3].data[0] = -8;
+            gSprites[ewram01000.unk3].data[2] = -0xA8;
             ewram01000.unk8 = var1;
             ewram01000.unkA = 11;
 
@@ -2504,8 +2504,8 @@ void sub_806CD5C(u8 taskId)
         }
         else
         {
-            gSprites[ewram01000.unk3].data0 = 8;
-            gSprites[ewram01000.unk3].data2 = 0xA8;
+            gSprites[ewram01000.unk3].data[0] = 8;
+            gSprites[ewram01000.unk3].data[2] = 0xA8;
             ewram01000.unk8 = 11;
             ewram01000.unkA = 11;
 
@@ -2515,8 +2515,8 @@ void sub_806CD5C(u8 taskId)
 
         gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
 
-        gSprites[ewram01000.unk4].data0 = 8;
-        gSprites[ewram01000.unk4].data2 = 0xA8;
+        gSprites[ewram01000.unk4].data[0] = 8;
+        gSprites[ewram01000.unk4].data[2] = 0xA8;
         gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
 
         gSprites[ewram01000.unk3].callback(&gSprites[ewram01000.unk3]);
@@ -2537,7 +2537,7 @@ void sub_806CF04(void)
     SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.unk4].pos1.x);
     SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.unk4].pos1.y);
     SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.unk4].pos2.x);
-    SwapValues_s16(&gSprites[ewram01000.unk3].data0, &gSprites[ewram01000.unk4].data0);
+    SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]);
 
     gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
     gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
@@ -2729,7 +2729,7 @@ void sub_806D198(u8 taskId)
     gSprites[ewram01000.unk4].pos2.y = 0;
     gSprites[ewram01000.unk4].callback = UpdateMonIconFrame_806DA38;
 
-    spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data0);
+    spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data[0]);
     gSprites[spriteId].callback = UpdateMonIconFrame_806DA0C;
 
     SwapPokemon(&gPlayerParty[ewram01000.unk5], &gPlayerParty[ewram01000.unk6]);
@@ -2752,15 +2752,15 @@ void SpriteCB_sub_806D37C(struct Sprite *sprite)
 {
     UpdateMonIconFrame(sprite);
 
-    if (sprite->pos2.x == sprite->data2)
+    if (sprite->pos2.x == sprite->data[2])
     {
-        sprite->data0 *= -1;
-        sprite->data2 = 0;
+        sprite->data[0] *= -1;
+        sprite->data[2] = 0;
         sprite->callback = UpdateMonIconFrame_806DA38;
     }
     else
     {
-        sprite->pos2.x += sprite->data0;
+        sprite->pos2.x += sprite->data[0];
     }
 }
 
@@ -2802,8 +2802,8 @@ void sub_806D4AC(u8 taskId, u16 species, u8 c)
         u8 monIndex = c + 3;
         u8 spriteId = GetMonIconSpriteId(taskId, monIndex);
 
-        gSprites[spriteId].data0 = -8;
-        gSprites[spriteId].data2 = gTasks[taskId].data[0] * -8;
+        gSprites[spriteId].data[0] = -8;
+        gSprites[spriteId].data[2] = gTasks[taskId].data[0] * -8;
         gSprites[spriteId].callback = SpriteCB_sub_806D37C;
     }
 }
@@ -3035,7 +3035,7 @@ void UpdateMonIconFrame_806DA44(u8 taskId, u8 monIndex, u8 c)
     {
         spriteId = GetMonIconSpriteId(taskId, monIndex);
         gSprites[spriteId].pos2.y = 0;
-        gSprites[spriteId].data0 = 0;
+        gSprites[spriteId].data[0] = 0;
 
         if (!c)
         {
@@ -3057,7 +3057,7 @@ void LoadHeldItemIconGraphics(void)
 void SpriteCB_HeldItemIcon(struct Sprite *sprite)
 {
 
-    u8 data7 = sprite->data7;
+    u8 data7 = sprite->data[7];
     if (gSprites[data7].invisible)
     {
         sprite->invisible = 1;
@@ -3081,7 +3081,7 @@ void CreateHeldItemIcon(u8 a, u8 b)
     gSprites[spriteId].pos2.x = 4;
     gSprites[spriteId].pos2.y = 10;
     gSprites[spriteId].callback = SpriteCB_HeldItemIcon;
-    gSprites[spriteId].data7 = a;
+    gSprites[spriteId].data[7] = a;
 
     StartSpriteAnim(&gSprites[spriteId], b);
     gSprites[spriteId].callback(&gSprites[spriteId]);
@@ -3138,8 +3138,8 @@ void CreateHeldItemIcons_806DC34(u8 taskId)
 
             gSprites[heldItemSpriteId].pos2.x = 4;
             gSprites[heldItemSpriteId].pos2.y = 10;
-            gSprites[heldItemSpriteId].data7 = monIconSpriteId;
-            gSprites[monIconSpriteId].data7 = heldItemSpriteId;
+            gSprites[heldItemSpriteId].data[7] = monIconSpriteId;
+            gSprites[monIconSpriteId].data[7] = heldItemSpriteId;
 
             SetHeldItemIconVisibility(taskId, i);
             gSprites[heldItemSpriteId].callback(&gSprites[heldItemSpriteId]);
@@ -3158,8 +3158,8 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item)
 
     gSprites[heldItemSpriteId].pos2.x = 4;
     gSprites[heldItemSpriteId].pos2.y = 10;
-    gSprites[heldItemSpriteId].data7 = monIconSpriteId;
-    gSprites[monIconSpriteId].data7 = heldItemSpriteId;
+    gSprites[heldItemSpriteId].data[7] = monIconSpriteId;
+    gSprites[monIconSpriteId].data[7] = heldItemSpriteId;
 
     if (!item)
     {
@@ -3274,7 +3274,7 @@ _0806DD78: .4byte gSprites\n\
 
 void SpriteCB_UpdateHeldItemIconPosition(struct Sprite *sprite)
 {
-    u8 spriteId = sprite->data7;
+    u8 spriteId = sprite->data[7];
 
     sprite->pos1.x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
     sprite->pos1.y = gSprites[spriteId].pos1.y;
@@ -3334,7 +3334,7 @@ void SetMonIconSpriteId(u8 taskId, u8 monIndex, u8 spriteId)
 u16 GetMonHeldItemIconSpriteId(u8 taskId, u8 monIndex)
 {
     u8 spriteId = GetMonIconSpriteId(taskId, monIndex);
-    u8 retVal = gSprites[spriteId].data7;
+    u8 retVal = gSprites[spriteId].data[7];
     return retVal;
 }
 
@@ -4478,7 +4478,7 @@ void sub_806FA18(u8 taskId)
         gTasks[taskId].data[11] -= gTasks[taskId].data[12];
         SetMonData(ewram1C000.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]);
         SetMonIconAnim(GetMonIconSpriteId(ewram1C000.unk4, ewram01000.unk1), ewram1C000.pokemon);
-        ewram1C000.unk5 = gSprites[ewram01000.unk2].data0;
+        ewram1C000.unk5 = gSprites[ewram01000.unk2].data[0];
         ewram1C000.pokemon = &gPlayerParty[ewram1C000.unk5];
         gTasks[taskId].data[10] = GetMonData(ewram1C000.pokemon, MON_DATA_MAX_HP);
         gTasks[taskId].data[11] = GetMonData(ewram1C000.pokemon, MON_DATA_HP);
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c
index a4497295f..5aa03ff7a 100644
--- a/src/field/pokeblock.c
+++ b/src/field/pokeblock.c
@@ -971,25 +971,25 @@ static void sub_810C854(u8 taskId)
 
 static void sub_810C8D4(struct Sprite *sprite)
 {
-    if (sprite->data0 > 1)
+    if (sprite->data[0] > 1)
     {
-        sprite->data0 = 0;
+        sprite->data[0] = 0;
     }
-    switch (sprite->data0)
+    switch (sprite->data[0])
     {
         case 0:
             sprite->oam.affineMode = 1;
             sprite->affineAnims = gSpriteAffineAnimTable_83F7F70;
             InitSpriteAffineAnim(sprite);
-            sprite->data0 = 1;
-            sprite->data1 = 0;
+            sprite->data[0] = 1;
+            sprite->data[1] = 0;
             break;
         case 1:
-            if (++sprite->data1 > 11)
+            if (++sprite->data[1] > 11)
             {
                 sprite->oam.affineMode = 0;
-                sprite->data0 = 0;
-                sprite->data1 = 0;
+                sprite->data[0] = 0;
+                sprite->data[1] = 0;
                 FreeOamMatrix(sprite->oam.matrixNum);
                 sprite->callback = SpriteCallbackDummy;
             }
diff --git a/src/field/region_map.c b/src/field/region_map.c
index 973e7decc..241b38bf6 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -1121,9 +1121,9 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
             gRegionMap->cursorSprite->pos1.x = gRegionMap->cursorPosX * 8 + 4;
             gRegionMap->cursorSprite->pos1.y = gRegionMap->cursorPosY * 8 + 4;
         }
-        gRegionMap->cursorSprite->data1 = 2;
-        gRegionMap->cursorSprite->data2 = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
-        gRegionMap->cursorSprite->data3 = 1;
+        gRegionMap->cursorSprite->data[1] = 2;
+        gRegionMap->cursorSprite->data[2] = IndexOfSpritePaletteTag(paletteTag) * 16 + 0x0101;
+        gRegionMap->cursorSprite->data[3] = 1;
     }
 }
 
@@ -1139,12 +1139,12 @@ static void sub_80FBCA0(void)
 
 void unref_sub_80FBCD0(void)
 {
-    gRegionMap->cursorSprite->data3 = 1;
+    gRegionMap->cursorSprite->data[3] = 1;
 }
 
 void unref_sub_80FBCE0(void)
 {
-    gRegionMap->cursorSprite->data3 = 0;
+    gRegionMap->cursorSprite->data[3] = 0;
 }
 
 static const struct OamData sPlayerIconOamData =
@@ -1259,16 +1259,16 @@ static void SpriteCB_PlayerIconZoomedIn(struct Sprite *sprite)
 {
     sprite->pos2.x = -(gRegionMap->scrollX * 2);
     sprite->pos2.y = -(gRegionMap->scrollY * 2);
-    sprite->data0 = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
-    sprite->data1 = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+    sprite->data[0] = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+    sprite->data[1] = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
 
     // Determine if sprite is on screen
-    if (sprite->data0 < -8 || sprite->data0 > 0xA8 || sprite->data1 < -8 || sprite->data1 > 0xF8)
-        sprite->data2 = FALSE;
+    if (sprite->data[0] < -8 || sprite->data[0] > 0xA8 || sprite->data[1] < -8 || sprite->data[1] > 0xF8)
+        sprite->data[2] = FALSE;
     else
-        sprite->data2 = TRUE;
+        sprite->data[2] = TRUE;
 
-    if (sprite->data2 == TRUE)
+    if (sprite->data[2] == TRUE)
         UpdateIconBlink(sprite);
     else
         sprite->invisible = TRUE;
@@ -1284,10 +1284,10 @@ static void UpdateIconBlink(struct Sprite *sprite)
     if (gRegionMap->blinkPlayerIcon)
     {
         // Toggle visibility every 16 frames
-        sprite->data7++;
-        if (sprite->data7 > 16)
+        sprite->data[7]++;
+        if (sprite->data[7] > 16)
         {
-            sprite->data7 = 0;
+            sprite->data[7] = 0;
             sprite->invisible = !sprite->invisible;
         }
     }
@@ -1691,7 +1691,7 @@ static void CreateCityTownFlyTargetIcons(void)
             else
                 r7 += 3;
             StartSpriteAnim(&gSprites[spriteId], r7);
-            gSprites[spriteId].data0 = i;
+            gSprites[spriteId].data[0] = i;
         }
         canFlyFlag++;
     }
@@ -1724,7 +1724,7 @@ static void CreateSpecialAreaFlyTargetIcons(void)
                 gSprites[spriteId].oam.size = 1;
                 gSprites[spriteId].callback = SpriteCB_FlyTargetIcons;
                 StartSpriteAnim(&gSprites[spriteId], 6);
-                gSprites[spriteId].data0 = mapSectionId;
+                gSprites[spriteId].data[0] = mapSectionId;
             }
         }
     }
@@ -1733,19 +1733,19 @@ static void CreateSpecialAreaFlyTargetIcons(void)
 static void SpriteCB_FlyTargetIcons(struct Sprite *sprite)
 {
     // Blink if our mapSectionId is the one selected on the map
-    if (ewram0_3.regionMap.mapSectionId == sprite->data0)
+    if (ewram0_3.regionMap.mapSectionId == sprite->data[0])
     {
         // Toggle visibility every 16 frames
-        sprite->data1++;
-        if (sprite->data1 > 16)
+        sprite->data[1]++;
+        if (sprite->data[1] > 16)
         {
-            sprite->data1 = 0;
+            sprite->data[1] = 0;
             sprite->invisible = !sprite->invisible;
         }
     }
     else
     {
-        sprite->data1 = 16;
+        sprite->data[1] = 16;
         sprite->invisible = FALSE;
     }
 }
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index e8ab7e1bf..a672f3489 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -762,7 +762,7 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY)
     y = gate->y + 7;
 
     sprite = &gSprites[spriteId];
-    sprite->data0 = gateId;
+    sprite->data[0] = gateId;
     sprite->coordOffsetEnabled = 1;
 
     sub_8060388(x + deltaX, y + deltaY, &sprite->pos1.x, &sprite->pos1.y);
@@ -778,8 +778,8 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
     u8 orientation;
     u8 affineAnimation;
 
-    rotationDirection = sprite->data1;
-    orientation = sprite->data2;
+    rotationDirection = sprite->data[1];
+    orientation = sprite->data[2];
 
     RotatingGate_HideGatesOutsideViewport(sprite);
 
@@ -804,7 +804,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
         StartSpriteAffineAnim(sprite, affineAnimation);
     }
 
-    sprite->data1 = ROTATE_NONE;
+    sprite->data[1] = ROTATE_NONE;
 }
 
 static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite)
@@ -1065,8 +1065,8 @@ static void RotatingGate_TriggerRotationAnimation(u8 gateId, int rotationDirecti
     if (gRotatingGate_GateSpriteIds[gateId] != MAX_SPRITES)
     {
         sprite = &gSprites[gRotatingGate_GateSpriteIds[gateId]];
-        sprite->data1 = rotationDirection;
-        sprite->data2 = RotatingGate_GetGateOrientation(gateId);
+        sprite->data[1] = rotationDirection;
+        sprite->data[2] = RotatingGate_GetGateOrientation(gateId);
     }
 }
 
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c
index 2b28df4f0..49590f83a 100644
--- a/src/field/starter_choose.c
+++ b/src/field/starter_choose.c
@@ -324,24 +324,24 @@ void CB2_ChooseStarter(void)
 
     //Create hand sprite
     spriteId = CreateSprite(&gSpriteTemplate_83F77CC, 120, 56, 2);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
 
     //Create three Pokeball sprites
     spriteId = CreateSprite(
       &gSpriteTemplate_83F77E4,
       gStarterChoose_PokeballCoords[0][0], gStarterChoose_PokeballCoords[0][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 0;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 0;
     spriteId = CreateSprite(
       &gSpriteTemplate_83F77E4,
       gStarterChoose_PokeballCoords[1][0], gStarterChoose_PokeballCoords[1][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 1;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 1;
     spriteId = CreateSprite(
       &gSpriteTemplate_83F77E4,
       gStarterChoose_PokeballCoords[2][0], gStarterChoose_PokeballCoords[2][1], 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 2;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 2;
 }
 
 static void MainCallback2(void)
@@ -727,16 +727,16 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
 //Sprite callback
 static void sub_810A62C(struct Sprite *sprite)
 {
-    sprite->pos1.x = gUnknown_083F76E4[gTasks[sprite->data0].tStarterSelection][0];
-    sprite->pos1.y = gUnknown_083F76E4[gTasks[sprite->data0].tStarterSelection][1];
-    sprite->pos2.y = Sin(sprite->data1, 8);
-    sprite->data1 = (u8)sprite->data1 + 4;
+    sprite->pos1.x = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][0];
+    sprite->pos1.y = gUnknown_083F76E4[gTasks[sprite->data[0]].tStarterSelection][1];
+    sprite->pos2.y = Sin(sprite->data[1], 8);
+    sprite->data[1] = (u8)sprite->data[1] + 4;
 }
 
 //Sprite callback
 static void sub_810A68C(struct Sprite *sprite)
 {
-    if (gTasks[sprite->data0].tStarterSelection == sprite->data1)
+    if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
         StartSpriteAnimIfDifferent(sprite, 1);
     else
         StartSpriteAnimIfDifferent(sprite, 0);
diff --git a/src/field/trainer_see.c b/src/field/trainer_see.c
index 85bd7ad0b..38bc6971c 100644
--- a/src/field/trainer_see.c
+++ b/src/field/trainer_see.c
@@ -485,11 +485,11 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = 1;
 
-    sprite->data0 = gFieldEffectArguments[0];
-    sprite->data1 = gFieldEffectArguments[1];
-    sprite->data2 = gFieldEffectArguments[2];
-    sprite->data3 = -5;
-    sprite->data7 = a2;
+    sprite->data[0] = gFieldEffectArguments[0];
+    sprite->data[1] = gFieldEffectArguments[1];
+    sprite->data[2] = gFieldEffectArguments[2];
+    sprite->data[3] = -5;
+    sprite->data[7] = a2;
 
     StartSpriteAnim(sprite, a3);
 }
@@ -498,22 +498,22 @@ void objc_exclamation_mark_probably(struct Sprite *sprite)
 {
     u8 mapObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data0, sprite->data1, sprite->data2, &mapObjId)
+    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId)
      || sprite->animEnded)
     {
-        FieldEffectStop(sprite, (u8)sprite->data7);
+        FieldEffectStop(sprite, (u8)sprite->data[7]);
     }
     else
     {
         struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
-        sprite->data4 += sprite->data3;
+        sprite->data[4] += sprite->data[3];
         sprite->pos1.x = mapObjSprite->pos1.x;
         sprite->pos1.y = mapObjSprite->pos1.y - 16;
         sprite->pos2.x = mapObjSprite->pos2.x;
-        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data4;
-        if (sprite->data4)
-            sprite->data3++;
+        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4];
+        if (sprite->data[4])
+            sprite->data[3]++;
         else
-            sprite->data3 = 0;
+            sprite->data[3] = 0;
     }
 }
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c
index 54ed89ef2..d301d93d6 100644
--- a/src/field/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
@@ -893,11 +893,11 @@ static void sub_8137138(void)
 
 static void sub_81371DC(struct Sprite *sprite)
 {
-    if (sprite->data0 <= 5)
+    if (sprite->data[0] <= 5)
         sprite->pos2.y -= 2;
-    else if (sprite->data0 <= 11)
+    else if (sprite->data[0] <= 11)
         sprite->pos2.y += 2;
-    if ((++sprite->data0) > 60)
+    if ((++sprite->data[0]) > 60)
     {
         DestroySprite(sprite);
         gUnknown_02039304->unk54--;
diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index 8db13dc2d..d86b1bc95 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -288,22 +288,22 @@ void CB2_StartWallClock(void)
     gTasks[taskId].tHourHandAngle = 300;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7AD8, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 1);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7AF0, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 0);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7B28, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 45;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 45;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7B40, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = 90;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = 90;
 
     WallClockInit();
 }
@@ -333,22 +333,22 @@ void CB2_ViewWallClock(void)
     }
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7AD8, 120, 80, 1);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7AF0, 120, 80, 0);
-    gSprites[spriteId].data0 = taskId;
+    gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7B28, 120, 80, 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = angle1;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = angle1;
 
     spriteId = CreateSprite(&gSpriteTemplate_83F7B40, 120, 80, 2);
-    gSprites[spriteId].data0 = taskId;
-    gSprites[spriteId].data1 = angle2;
+    gSprites[spriteId].data[0] = taskId;
+    gSprites[spriteId].data[1] = angle2;
 
     WallClockInit();
 }
@@ -968,7 +968,7 @@ static void sub_810B05C(struct Sprite *sprite)
     u16 x;
     u16 y;
 
-    angle = gTasks[sprite->data0].tMinuteHandAngle;
+    angle = gTasks[sprite->data[0]].tMinuteHandAngle;
     sin = Sin2(angle) / 16;
     cos = Cos2(angle) / 16;
     SetOamMatrix(0, cos, sin, -sin, cos);
@@ -993,7 +993,7 @@ static void sub_810B0F4(struct Sprite *sprite)
     u16 x;
     u16 y;
 
-    angle = gTasks[sprite->data0].tHourHandAngle;
+    angle = gTasks[sprite->data[0]].tHourHandAngle;
     sin = Sin2(angle) / 16;
     cos = Cos2(angle) / 16;
     SetOamMatrix(1, cos, sin, -sin, cos);
@@ -1015,23 +1015,23 @@ static void sub_810B18C(struct Sprite *sprite)
     s16 sin;
     s16 cos;
 
-    if (gTasks[sprite->data0].tPeriod != PERIOD_AM)
+    if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM)
     {
-        if (sprite->data1 >= 60 && sprite->data1 < 90)
-            sprite->data1 += 5;
-        if (sprite->data1 < 60)
-            sprite->data1++;
+        if (sprite->data[1] >= 60 && sprite->data[1] < 90)
+            sprite->data[1] += 5;
+        if (sprite->data[1] < 60)
+            sprite->data[1]++;
     }
     else
     {
-        if (sprite->data1 > 45 && sprite->data1 <= 75)
-            sprite->data1 -= 5;
-        if (sprite->data1 > 75)
-            sprite->data1--;
+        if (sprite->data[1] > 45 && sprite->data[1] <= 75)
+            sprite->data[1] -= 5;
+        if (sprite->data[1] > 75)
+            sprite->data[1]--;
     }
-    cos = Cos2((u16)sprite->data1);
+    cos = Cos2((u16)sprite->data[1]);
     sprite->pos2.x =  cos * 30 / 4096;
-    sin = Sin2((u16)sprite->data1);
+    sin = Sin2((u16)sprite->data[1]);
     sprite->pos2.y = sin * 30 / 4096;
 }
 
@@ -1040,22 +1040,22 @@ static void sub_810B230(struct Sprite *sprite)
     s16 sin;
     s16 cos;
 
-    if (gTasks[sprite->data0].tPeriod != PERIOD_AM)
+    if (gTasks[sprite->data[0]].tPeriod != PERIOD_AM)
     {
-        if (sprite->data1 >= 105 && sprite->data1 < 135)
-            sprite->data1 += 5;
-        if (sprite->data1 < 105)
-            sprite->data1++;
+        if (sprite->data[1] >= 105 && sprite->data[1] < 135)
+            sprite->data[1] += 5;
+        if (sprite->data[1] < 105)
+            sprite->data[1]++;
     }
     else
     {
-        if (sprite->data1 > 90 && sprite->data1 <= 120)
-            sprite->data1 -= 5;
-        if (sprite->data1 > 120)
-            sprite->data1--;
+        if (sprite->data[1] > 90 && sprite->data[1] <= 120)
+            sprite->data[1] -= 5;
+        if (sprite->data[1] > 120)
+            sprite->data[1]--;
     }
-    cos = Cos2((u16)sprite->data1);
+    cos = Cos2((u16)sprite->data[1]);
     sprite->pos2.x =  cos * 30 / 4096;
-    sin = Sin2((u16)sprite->data1);
+    sin = Sin2((u16)sprite->data[1]);
     sprite->pos2.y = sin * 30 / 4096;
 }