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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/battle/smokescreen.c b/src/battle/smokescreen.c
index 8345cb6ad..dc2887007 100644
--- a/src/battle/smokescreen.c
+++ b/src/battle/smokescreen.c
@@ -22,28 +22,28 @@ u8 sub_8046234(s16 x, s16 y, u8 a3)
 
     mainSpriteId = CreateInvisibleSpriteWithCallback(sub_8046388);
     mainSprite = &gSprites[mainSpriteId];
-    mainSprite->data1 = a3;
+    mainSprite->data[1] = a3;
 
     spriteId1 = CreateSprite(&gSpriteTemplate_81FAF0C, x - 16, y - 16, 2);
-    gSprites[spriteId1].data0 = mainSpriteId;
-    mainSprite->data0++;
+    gSprites[spriteId1].data[0] = mainSpriteId;
+    mainSprite->data[0]++;
     AnimateSprite(&gSprites[spriteId1]);
 
     spriteId2 = CreateSprite(&gSpriteTemplate_81FAF0C, x, y - 16, 2);
-    gSprites[spriteId2].data0 = mainSpriteId;
-    mainSprite->data0++;
+    gSprites[spriteId2].data[0] = mainSpriteId;
+    mainSprite->data[0]++;
     StartSpriteAnim(&gSprites[spriteId2], 1);
     AnimateSprite(&gSprites[spriteId2]);
 
     spriteId3 = CreateSprite(&gSpriteTemplate_81FAF0C, x - 16, y, 2);
-    gSprites[spriteId3].data0 = mainSpriteId;
-    mainSprite->data0++;
+    gSprites[spriteId3].data[0] = mainSpriteId;
+    mainSprite->data[0]++;
     StartSpriteAnim(&gSprites[spriteId3], 2);
     AnimateSprite(&gSprites[spriteId3]);
 
     spriteId4 = CreateSprite(&gSpriteTemplate_81FAF0C, x, y, 2);
-    gSprites[spriteId4].data0 = mainSpriteId;
-    mainSprite->data0++;
+    gSprites[spriteId4].data[0] = mainSpriteId;
+    mainSprite->data[0]++;
     StartSpriteAnim(&gSprites[spriteId4], 3);
     AnimateSprite(&gSprites[spriteId4]);
 
@@ -52,11 +52,11 @@ u8 sub_8046234(s16 x, s16 y, u8 a3)
 
 static void sub_8046388(struct Sprite *sprite)
 {
-    if (!sprite->data0)
+    if (!sprite->data[0])
     {
         FreeSpriteTilesByTag(gUnknown_081FAEA4.tag);
         FreeSpritePaletteByTag(gUnknown_081FAEAC.tag);
-        if (!sprite->data1)
+        if (!sprite->data[1])
             DestroySprite(sprite);
         else
             sprite->callback = SpriteCallbackDummy;
@@ -67,7 +67,7 @@ void sub_80463CC(struct Sprite *sprite)
 {
     if (sprite->animEnded)
     {
-        gSprites[sprite->data0].data0--;
+        gSprites[sprite->data[0]].data[0]--;
         DestroySprite(sprite);
     }
 }