From b116608e12940141e7c1167d0a2868abc72829fc Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Wed, 4 Dec 2019 11:41:07 -0800
Subject: Use ST_OAM defines for OamData.

---
 src/dodrio_berry_picking.c | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 7fd135d52..515c20f9f 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -412,14 +412,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478C98 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = ST_OAM_SIZE_3,
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -429,14 +429,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CA0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = ST_OAM_SIZE_1,
     .tileNum = 0,
     .priority = 0,
     .paletteNum = 0,
@@ -446,14 +446,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CA8 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_SQUARE,
     .x = 0,
     .matrixNum = 0,
-    .size = 1,
+    .size = ST_OAM_SIZE_1,
     .tileNum = 0,
     .priority = 2,
     .paletteNum = 0,
@@ -463,14 +463,14 @@ ALIGNED(4)
 /*static*/ const struct OamData sOamData_8478CB0 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .mosaic = 0,
-    .bpp = 0,
-    .shape = 1,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = ST_OAM_H_RECTANGLE,
     .x = 0,
     .matrixNum = 0,
-    .size = 3,
+    .size = ST_OAM_SIZE_3,
     .tileNum = 0,
     .priority = 3,
     .paletteNum = 0,
-- 
cgit v1.2.3