Flatten pos fields in struct Sprite

src/naming_screen.c

@@ -1015,7 +1015,7 @@ static void sub_809E7F0(struct Sprite *sprite)
         sprite->data[0] = 8;
         sprite->data[1] = (sprite->data[1] + 1) & 3;
     }
-    sprite->pos2.x = arr[sprite->data[1]];
+    sprite->x2 = arr[sprite->data[1]];
 }
 
 static void sub_809E83C(struct Sprite *sprite)
@@ -1026,13 +1026,13 @@ static void sub_809E83C(struct Sprite *sprite)
     var = GetTextCaretPosition();
     if (var != (u8)sprite->data[0])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[1] = 0;
         sprite->data[2] = 0;
     }
     else
     {
-        sprite->pos2.y = arr[sprite->data[1]];
+        sprite->y2 = arr[sprite->data[1]];
         sprite->data[2]++;
         if (sprite->data[2] > 8)
         {
@@ -1067,11 +1067,11 @@ static void SetCursorPos(s16 x, s16 y)
     struct Sprite *cursorSprite = &gSprites[sNamingScreenData->cursorSpriteId];
 
     if (x < gUnknown_83E2330[sub_809DE50()])
-        cursorSprite->pos1.x = gUnknown_83E2333[sub_809DE50()][x] + 38;
+        cursorSprite->x = gUnknown_83E2333[sub_809DE50()][x] + 38;
     else
-        cursorSprite->pos1.x = 0;
+        cursorSprite->x = 0;
 
-    cursorSprite->pos1.y = y * 16 + 88;
+    cursorSprite->y = y * 16 + 88;
     cursorSprite->data[2] = cursorSprite->data[0];
     cursorSprite->data[3] = cursorSprite->data[1];
     cursorSprite->data[0] = x;
@@ -1200,11 +1200,11 @@ static bool8 PageSwapSpritesCB_SwapHide(struct Sprite *sprite)
     struct Sprite *sprite2 = &gSprites[sprite->data[7]];
     u8 page;
 
-    sprite1->pos2.y++;
-    if (sprite1->pos2.y > 7)
+    sprite1->y2++;
+    if (sprite1->y2 > 7)
     {
         sprite->data[0]++;
-        sprite1->pos2.y = -4;
+        sprite1->y2 = -4;
         sprite1->invisible = TRUE;
         page = sprite->data[1];
         sub_809ED88(sub_809DE20((page + 1) % 3), sprite1, sprite2);
@@ -1218,10 +1218,10 @@ static bool8 PageSwapSpritesCB_SwapShow(struct Sprite *sprite)
     struct Sprite *sprite2 = &gSprites[sprite->data[7]];
 
     sprite1->invisible = FALSE;
-    sprite1->pos2.y++;
-    if (sprite1->pos2.y >= 0)
+    sprite1->y2++;
+    if (sprite1->y2 >= 0)
     {
-        sprite1->pos2.y = 0;
+        sprite1->y2 = 0;
         sprite->data[0] = 1;
     }
     return FALSE;