Merge branch 'master' into doc-matchcall

2019-12-10 20:43:27 -05:00
parent 77bf40d32b 49f1a90534
commit 47b0d8a597
299 changed files with 7336 additions and 5366 deletions
@@ -719,8 +719,8 @@ void sub_81CE9E4(void)
        if (spriteId != MAX_SPRITES)
        {
            structPtr->unk1806[i] = spriteId;
-            gSprites[spriteId].oam.shape = 1;
-            gSprites[spriteId].oam.size = 2;
+            gSprites[spriteId].oam.shape = SPRITE_SHAPE(32x16);
+            gSprites[spriteId].oam.size = SPRITE_SIZE(32x16);
        }
        else
        {