1 files changed, 31 insertions, 18 deletions

diff --git a/src/title_screen.c b/src/title_screen.c
index 80d5464fa..b9ef53000 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -23,9 +23,7 @@
 #include "constants/rgb.h"
 #include "constants/songs.h"
 
-#define VERSION_BANNER_SHAPE 1
 #define VERSION_BANNER_RIGHT_TILEOFFSET 64
-#define VERSION_BANNER_BYTES 0x1000
 #define VERSION_BANNER_LEFT_X 98
 #define VERSION_BANNER_RIGHT_X 162
 #define VERSION_BANNER_Y 2
@@ -108,10 +106,10 @@ static const struct OamData sVersionBannerLeftOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 1,
-    .shape = VERSION_BANNER_SHAPE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -125,10 +123,10 @@ static const struct OamData sVersionBannerRightOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 1,
-    .shape = VERSION_BANNER_SHAPE,
+    .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x32),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -181,8 +179,12 @@ static const struct SpriteTemplate sVersionBannerRightSpriteTemplate =
 
 static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] =
 {
-    {gTitleScreenEmeraldVersionGfx, VERSION_BANNER_BYTES, 1000},
-    {NULL},
+    {
+        .data = gTitleScreenEmeraldVersionGfx,
+        .size = 0x1000,
+        .tag = 1000
+    },
+    {},
 };
 
 static const struct OamData sOamData_CopyrightBanner =
@@ -192,10 +194,10 @@ static const struct OamData sOamData_CopyrightBanner =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 1,
+    .shape = SPRITE_SHAPE(32x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(32x8),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -280,14 +282,21 @@ static const struct SpriteTemplate sStartCopyrightBannerSpriteTemplate =
 
 static const struct CompressedSpriteSheet sSpriteSheet_PressStart[] =
 {
-    {gTitleScreenPressStartGfx, 0x520, 1001},
-    {NULL},
+    {
+        .data = gTitleScreenPressStartGfx,
+        .size = 0x520,
+        .tag = 1001
+    },
+    {},
 };
 
 static const struct SpritePalette sSpritePalette_PressStart[] =
 {
-    {gTitleScreenPressStartPal, 1001},
-    {NULL},
+    {
+        .data = gTitleScreenPressStartPal,
+        .tag = 1001
+    },
+    {},
 };
 
 static const struct OamData sPokemonLogoShineOamData =
@@ -297,10 +306,10 @@ static const struct OamData sPokemonLogoShineOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -331,8 +340,12 @@ static const struct SpriteTemplate sPokemonLogoShineSpriteTemplate =
 
 static const struct CompressedSpriteSheet sPokemonLogoShineSpriteSheet[] =
 {
-    {sTitleScreenLogoShineGfx, 0x800, 1002},
-    {NULL},
+    {
+        .data = sTitleScreenLogoShineGfx,
+        .size = 0x800,
+        .tag = 1002
+    },
+    {},
 };
 
 // code