Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 16 insertions, 16 deletions

diff --git a/src/data/field_event_obj/base_oam.h b/src/data/field_event_obj/base_oam.h
index 543382d43..af961f492 100755
--- a/src/data/field_event_obj/base_oam.h
+++ b/src/data/field_event_obj/base_oam.h
@@ -1,47 +1,47 @@
 const struct OamData gEventObjectBaseOam_8x8 = {
-    .shape = 0,
-    .size = 0,
+    .shape = SPRITE_SHAPE(8x8),
+    .size = SPRITE_SIZE(8x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x8 = {
-    .shape = 1,
-    .size = 0,
+    .shape = SPRITE_SHAPE(16x8),
+    .size = SPRITE_SIZE(16x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x16 = {
-    .shape = 0,
-    .size = 1,
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_32x8 = {
-    .shape = 1,
-    .size = 1,
+    .shape = SPRITE_SHAPE(32x8),
+    .size = SPRITE_SIZE(32x8),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_64x32 = {
-    .shape = 1,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x32),
+    .size = SPRITE_SIZE(64x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_16x32 = {
-    .shape = 2,
-    .size = 2,
+    .shape = SPRITE_SHAPE(16x32),
+    .size = SPRITE_SIZE(16x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_32x32 = {
-    .shape = 0,
-    .size = 2,
+    .shape = SPRITE_SHAPE(32x32),
+    .size = SPRITE_SIZE(32x32),
     .priority = 2
 };
 
 const struct OamData gEventObjectBaseOam_64x64 = {
-    .shape = 0,
-    .size = 3,
+    .shape = SPRITE_SHAPE(64x64),
+    .size = SPRITE_SIZE(64x64),
     .priority = 2
 };