Use constants for Oam .shape and .size fields

Also some general formatting fixes for constants.
2019-03-11 03:12:15 -04:00
parent 291df27dcb
commit 9848f84b9e
61 changed files with 1422 additions and 913 deletions
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -93,8 +93,8 @@ static const struct OamData gOamData_858E4D8 =
    .affineMode = ST_OAM_AFFINE_OFF,
    .objMode = ST_OAM_OBJ_NORMAL,
    .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_SQUARE,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
    .priority = 2,
 };

@@ -246,8 +246,8 @@ static const struct OamData gOamData_858E658 =
    .affineMode = ST_OAM_AFFINE_OFF,
    .objMode = ST_OAM_OBJ_NORMAL,
    .bpp = ST_OAM_4BPP,
-    .shape = ST_OAM_V_RECTANGLE,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
    .priority = 2,
 };