Merge remote-tracking branch 'upstream/master' into move-tutor

# Conflicts: # include/pokenav.h # src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
@@ -222,10 +222,10 @@ static const struct OamData sOamData_PokeblockCase =
    .objMode = 0,
    .mosaic = 0,
    .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(64x64),
    .x = 0,
    .matrixNum = 0,
-    .size = 3,
+    .size = SPRITE_SIZE(64x64),
    .tileNum = 0,
    .priority = 2,
    .paletteNum = 0,