Merge pull request #462 from ProjectRevoTPP/sprite_struct

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

1 files changed, 11 insertions, 11 deletions

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;
 }