Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers

2020-01-26 12:23:08 -05:00
parent 4c12ad00d2 9a6c2c25d0
commit 9c934c9664
228 changed files with 440 additions and 717 deletions
@@ -994,9 +994,9 @@ static void Task_BuyHowManyDialogueInit(u8 taskId)

    maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / gShopDataPtr->totalCost;

-    if (maxQuantity > 99)
+    if (maxQuantity > MAX_BAG_ITEM_CAPACITY)
    {
-        gShopDataPtr->maxQuantity = 99;
+        gShopDataPtr->maxQuantity = MAX_BAG_ITEM_CAPACITY;
    }
    else
    {