Merge master into ObjEvent rename

2019-12-06 21:37:17 -05:00
parent 1b30f0c973 47ea65b96e
commit b93101bbeb
167 changed files with 3292 additions and 1686 deletions
@@ -92,10 +92,10 @@ static const struct HyperCutterUnk sHyperCutStruct[] =
 static const struct OamData sOamData_CutGrass =
 {
    .y = 0,
-    .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,