Use ST_OAM constants for OamData definitions

2019-12-04 15:25:13 -05:00
parent 22fd579fd9
commit c40879aa36
52 changed files with 425 additions and 425 deletions
@@ -39,10 +39,10 @@ static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
 static const struct OamData sVsLetter_V_OamData =
 {
    .y = 0,
-    .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(64x64),
    .x = 0,
    .matrixNum = 0,
@@ -56,10 +56,10 @@ static const struct OamData sVsLetter_V_OamData =
 static const struct OamData sVsLetter_S_OamData =
 {
    .y = 0,
-    .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(64x64),
    .x = 0,
    .matrixNum = 0,