Merge branch 'master' into doc-partymenu

2019-10-31 14:22:51 -04:00
parent b33db9b96c 67ce8c9cc2
commit b1ea2592c3
219 changed files with 7959 additions and 7663 deletions
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1652,7 +1652,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId)
            if (gBagPositionStruct.pocket != BERRIES_POCKET)
                ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
            else
-                sub_80FDD10(taskId);
+                ItemUseOutOfBattle_Berry(taskId);
        }
    }
 }