diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
| commit | 6bef5a2622b432049df9c8b581e21ae09965b02c (patch) | |
| tree | d764c1d61d17018c41ef9eab403137d5aeef17d0 /src/field/shop.c | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) | |
merge
Diffstat (limited to 'src/field/shop.c')
| -rw-r--r-- | src/field/shop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/shop.c b/src/field/shop.c index 65be76b81..a87c859b7 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -173,7 +173,7 @@ static void Task_HandleShopMenuBuy(u8 taskId) gTasks[taskId].data[8] = (u32)BuyMenuDrawGraphics >> 16; gTasks[taskId].data[9] = (u32)BuyMenuDrawGraphics; gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_HandleShopMenuSell(u8 taskId) @@ -181,7 +181,7 @@ static void Task_HandleShopMenuSell(u8 taskId) gTasks[taskId].data[8] = (u32)ItemMenu_LoadSellMenu >> 16; gTasks[taskId].data[9] = (u32)ItemMenu_LoadSellMenu; gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_HandleShopMenuQuit(u8 taskId) @@ -213,7 +213,7 @@ static void ReturnToShopMenuAfterExitingSellMenu(u8 taskId) static void Task_ReturnToMartMenu(u8 taskId) { - if (sub_807D770() == 1) + if (IsWeatherNotFadingIn() == 1) { if (gMartInfo.martType == MART_TYPE_2) DisplayItemMessageOnField(taskId, gOtherText_CanIHelpYou, ReturnToShopMenuAfterExitingSellMenu, 0); |