From 9848f84b9ec2d5950cb5dc4600b7651486ff986a Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Mon, 11 Mar 2019 03:12:15 -0400
Subject: Use constants for Oam .shape and .size fields

Also some general formatting fixes for constants.
---
 src/starter_choose.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'src/starter_choose.c')

diff --git a/src/starter_choose.c b/src/starter_choose.c
index 4ed53539f..c3d636175 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -170,10 +170,10 @@ static const struct OamData gOamData_85B1E10 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -187,10 +187,10 @@ static const struct OamData gOamData_85B1E18 =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
-    .size = 2,
+    .size = SPRITE_SIZE(32x32),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -204,10 +204,10 @@ static const struct OamData gOamData_85B1E20 =
     .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 = 1,
     .paletteNum = 0,
@@ -296,21 +296,35 @@ static const union AffineAnimCmd * const gSpriteAffineAnimTable_85B1ED4[] = {gSp
 
 static const struct CompressedSpriteSheet gUnknown_085B1ED8[] =
 {
-    gUnknown_085B18AC, 0x0800, 0x1000,
-    NULL,
+    {
+        .data = gUnknown_085B18AC,
+        .size = 0x0800,
+        .tag = 0x1000
+    },
+    {}
 };
 
 static const struct CompressedSpriteSheet gUnknown_085B1EE8[] =
 {
-    gUnknown_085B1BCC, 0x0800, 0x1001,
-    NULL,
+    {
+        .data = gUnknown_085B1BCC,
+        .size = 0x0800,
+        .tag = 0x1001
+    },
+    {}
 };
 
 static const struct SpritePalette gUnknown_085B1EF8[] =
 {
-    gBirchBallarrow_Pal, 0x1000,
-    gBirchCircle_Pal, 0x1001,
-    NULL,
+    {
+        .data = gBirchBallarrow_Pal,
+        .tag = 0x1000
+    },
+    {
+        .data = gBirchCircle_Pal,
+        .tag = 0x1001
+    },
+    {},
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Hand =
-- 
cgit v1.2.3


From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 4 Apr 2019 23:53:06 +0200
Subject: Clean up data headers

---
 src/starter_choose.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/starter_choose.c')

diff --git a/src/starter_choose.c b/src/starter_choose.c
index c3d636175..c3957e403 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"
-- 
cgit v1.2.3