Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-12-21 05:19:27 -05:00
commit 68cdd7b1cb
67 files changed
+1026 -822

No files matched your search

+1 -1
View File
@@ -390,7 +390,7 @@ static void Task_GoToBuyOrSellMenu(u8 taskId)
static void MapPostLoadHook_ReturnToShopMenu(void)
{
pal_fill_black();
FadeInFromBlack();
CreateTask(Task_ReturnToShopMenu, 8);
}