diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
commit | 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch) | |
tree | 9e276d9e08c46e9fe4f92af636d53f1dda33190a /src/shop.c | |
parent | ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff) | |
parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) |
Merge master into doc-tower
Diffstat (limited to 'src/shop.c')
-rwxr-xr-x | src/shop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shop.c b/src/shop.c index 324154d2e..3fe490941 100755 --- a/src/shop.c +++ b/src/shop.c @@ -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) |