From c40879aa3693a18c23be42cce54d52ca7afe1bca Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Wed, 4 Dec 2019 15:25:13 -0500
Subject: Use ST_OAM constants for OamData definitions

---
 src/intro.c | 72 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 58f2509cc..904f6d67c 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -141,10 +141,10 @@ static const struct SpritePalette gIntroPalette_Lightning[] =
 static const struct OamData gUnknown_085E4A94 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -210,10 +210,10 @@ static const struct SpritePalette gIntroPokemonRunningPalette[] =
 static const struct OamData gUnknown_085E4B28 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -247,10 +247,10 @@ static const struct SpriteTemplate gUnknown_085E4B40 =
 static const struct OamData gUnknown_085E4B58 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -303,10 +303,10 @@ static const struct SpriteTemplate gUnknown_085E4BA4 =
 static const struct OamData gUnknown_085E4BBC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
@@ -352,10 +352,10 @@ static const struct SpritePalette gIntroRayquazaLightningPalette[] =
 static const struct OamData gUnknown_085E4C14 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -437,10 +437,10 @@ static const s16 gIntroKyogreBubbleData[][3] =
 static const struct OamData gUnknown_085E4CF0 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x32),
     .x = 0,
     .matrixNum = 0,
@@ -477,10 +477,10 @@ static const struct SpriteTemplate gUnknown_085E4D14 =
 static const struct OamData gUnknown_085E4D2C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x32),
     .x = 0,
     .matrixNum = 0,
@@ -568,10 +568,10 @@ static const union AnimCmd *const gIntroBicycleAnimationCommands[] =
 static const struct OamData gUnknown_085E4DD4 =
 {
     .y = 160,
-    .affineMode = 3,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(16x16),
     .x = 0,
     .matrixNum = 0,
@@ -584,10 +584,10 @@ static const struct OamData gUnknown_085E4DD4 =
 static const struct OamData gUnknown_085E4DDC =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
@@ -600,10 +600,10 @@ static const struct OamData gUnknown_085E4DDC =
 static const struct OamData gUnknown_085E4DE4 =
 {
     .y = 160,
-    .affineMode = 3,
-    .objMode = 1,
+    .affineMode = ST_OAM_AFFINE_DOUBLE,
+    .objMode = ST_OAM_OBJ_BLEND,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x64),
     .x = 0,
     .matrixNum = 0,
@@ -800,10 +800,10 @@ static const u8 gUnknown_085E4FA4[] =
 static const struct OamData gUnknown_085E4FB0 =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x32),
     .x = 0,
     .matrixNum = 0,
@@ -853,10 +853,10 @@ static const struct SpritePalette gIntroPalette_DropLogoFlygon[] =
 static const struct OamData gUnknown_085E501C =
 {
     .y = 160,
-    .affineMode = 0,
-    .objMode = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
-    .bpp = 0,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(64x64),
     .x = 0,
     .matrixNum = 0,
-- 
cgit v1.2.3