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
@@ -392,7 +392,9 @@ const struct SpritePalette gUnknown_085A73E0 = {
 };

 const struct OamData Unknown_085A73E8 = {
-    .size = 1, .priority = 1
+    .shape = SPRITE_SHAPE(16x16),
+    .size = SPRITE_SIZE(16x16),
+    .priority = 1
 };

 const union AnimCmd Unknown_085A73F0[] = {