Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-12-21 05:19:27 -05:00
67 changed files with 1026 additions and 822 deletions
+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);
}