Merge master into ObjEvent rename

2019-12-06 21:37:17 -05:00
parent 1b30f0c973 47ea65b96e
commit b93101bbeb
167 changed files with 3292 additions and 1686 deletions
@@ -439,7 +439,7 @@ static void CB2_InitBuyMenu(void)
    {
    case 0:
        SetVBlankHBlankCallbacksToNull();
-        CpuFastFill(0, (void *)OAM, 0x400);
+        CpuFastFill(0, (void *)OAM, OAM_SIZE);
        ScanlineEffect_Stop();
        reset_temp_tile_data_buffers();
        FreeAllSpritePalettes();
@@ -856,7 +856,7 @@ static void BuyMenuDrawObjectEvents(void)
        if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE)
        {
            gSprites[spriteId].subspriteTableNum = 4;
-            gSprites[spriteId].subspriteMode = 1;
+            gSprites[spriteId].subspriteMode = SUBSPRITES_ON;
        }

        StartSpriteAnim(&gSprites[spriteId], gShopDataPtr->viewportObjects[i][ANIM_NUM]);