diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-24 23:38:36 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-24 23:38:36 -0500 |
| commit | 4ba3b9f592e2a23bb57e59ca41acd0cfb27a0d84 (patch) | |
| tree | 4009791ef38c7f47f8ba14a1ba17ea3e75058544 /src/field/shop.c | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | 4e54b9f65e93e84887ef81b726a187bbf3197530 (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); |