Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2019-12-18 13:16:38 -05:00
committed by GitHub
82 changed files with 3472 additions and 6562 deletions
+2 -2
View File
@@ -348,7 +348,7 @@ static void Task_HandleShopMenuBuy(u8 taskId)
data[8] = (u32)CB2_InitBuyMenu >> 16;
data[9] = (u32)CB2_InitBuyMenu;
gTasks[taskId].func = Task_GoToBuyOrSellMenu;
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
}
static void Task_HandleShopMenuSell(u8 taskId)
@@ -357,7 +357,7 @@ static void Task_HandleShopMenuSell(u8 taskId)
data[8] = (u32)CB2_GoToSellMenu >> 16;
data[9] = (u32)CB2_GoToSellMenu;
gTasks[taskId].func = Task_GoToBuyOrSellMenu;
FadeScreen(1, 0);
FadeScreen(FADE_TO_BLACK, 0);
}
void CB2_ExitSellMenu(void)