Flatten pos fields in struct Sprite

1 files changed, 17 insertions, 17 deletions

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index d2c7555e2..4c2ee703a 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -629,9 +629,9 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
     {
         gTasks[taskId].data[3]--;
     }
-    else if (gSprites[gTasks[taskId].data[4]].pos1.x != 192)
+    else if (gSprites[gTasks[taskId].data[4]].x != 192)
     {
-        gSprites[gTasks[taskId].data[4]].pos1.x++;
+        gSprites[gTasks[taskId].data[4]].x++;
     }
     else
     {
@@ -1220,18 +1220,18 @@ static void SpriteCB_EndGetOnScreen(struct Sprite * sprite)
 
 static void SpriteCB_GetOnScreen(struct Sprite * sprite)
 {
-    if (sprite->pos1.x != sprite->data[1]
-        || sprite->pos1.y != sprite->data[2])
+    if (sprite->x != sprite->data[1]
+        || sprite->y != sprite->data[2])
     {
-        if (sprite->pos1.x < sprite->data[1])
-            sprite->pos1.x += 15;
-        if (sprite->pos1.x > sprite->data[1])
-            sprite->pos1.x -= 15;
-
-        if (sprite->pos1.y < sprite->data[2])
-            sprite->pos1.y += 10;
-        if (sprite->pos1.y > sprite->data[2])
-            sprite->pos1.y -= 10;
+        if (sprite->x < sprite->data[1])
+            sprite->x += 15;
+        if (sprite->x > sprite->data[1])
+            sprite->x -= 15;
+
+        if (sprite->y < sprite->data[2])
+            sprite->y += 10;
+        if (sprite->y > sprite->data[2])
+            sprite->y -= 10;
     }
     else
     {
@@ -1242,7 +1242,7 @@ static void SpriteCB_GetOnScreen(struct Sprite * sprite)
 
 static void SpriteCB_Confetti(struct Sprite* sprite)
 {
-    if (sprite->pos2.y > 120)
+    if (sprite->y2 > 120)
     {
         DestroySprite(sprite);
     }
@@ -1251,12 +1251,12 @@ static void SpriteCB_Confetti(struct Sprite* sprite)
         u16 rand;
         u8 tableID;
 
-        sprite->pos2.y++;
-        sprite->pos2.y += sprite->data[1];
+        sprite->y2++;
+        sprite->y2 += sprite->data[1];
 
         tableID = sprite->data[0];
         rand = (Random() % 4) + 8;
-        sprite->pos2.x = rand * gSineTable[tableID] / 256;
+        sprite->x2 = rand * gSineTable[tableID] / 256;
 
         sprite->data[0] += 4;
     }