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/trainer_see.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/trainer_see.c')

diff --git a/src/trainer_see.c b/src/trainer_see.c
index 16ea88a45..9925aa6bc 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -100,10 +100,10 @@ static const struct OamData sOamData_Icons =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = SPRITE_SIZE(16x16),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
@@ -112,13 +112,22 @@ static const struct OamData sOamData_Icons =
 
 static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] =
 {
-    {sEmotion_ExclamationMarkGfx, 0x80},
-    {sEmotion_QuestionMarkGfx, 0x80}
+    {
+        .data = sEmotion_ExclamationMarkGfx,
+        .size = 0x80
+    },
+    {
+        .data = sEmotion_QuestionMarkGfx,
+        .size = 0x80
+    }
 };
 
 static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] =
 {
-    {sEmotion_HeartGfx, 0x80}
+    {
+        .data = sEmotion_HeartGfx,
+        .size = 0x80
+    }
 };
 
 static const union AnimCmd sSpriteAnim_Icons1[] =
-- 
cgit v1.2.3