diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 89402be39..3e9c14354 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -65,6 +65,7 @@ ViridianCity_Mart_EventScript_Clerk:: .align 2 ViridianCity_Mart_Items:: + .2byte ITEM_FRESH_START_MOCHI .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE diff --git a/src/party_menu.c b/src/party_menu.c index 686f27d95..9b970ad00 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -5173,6 +5173,18 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task) } } +void ItemUseCB_ResetEVsStep(u8 taskId, TaskFunc task) +{ + gPartyMenuUseExitCallback = TRUE; + PlaySE(SE_USE_ITEM); + RemoveBagItem(gSpecialVar_ItemId, 1); + GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1); + StringExpandPlaceholders(gStringVar4, gText_BasePointsResetToZero); + DisplayPartyMenuMessage(gStringVar4, TRUE); + ScheduleBgCopyTilemapToVram(2); + gTasks[taskId].func = task; +} + void ItemUseCB_ResetEVs(u8 taskId, TaskFunc task) { struct Pokemon *mon = &gPlayerParty[gPartyMenu.slotId]; @@ -5189,14 +5201,8 @@ void ItemUseCB_ResetEVs(u8 taskId, TaskFunc task) } else { - gPartyMenuUseExitCallback = TRUE; - PlaySE(SE_USE_ITEM); - RemoveBagItem(item, 1); - GetMonNickname(mon, gStringVar1); - StringExpandPlaceholders(gStringVar4, gText_BasePointsResetToZero); - DisplayPartyMenuMessage(gStringVar4, TRUE); - ScheduleBgCopyTilemapToVram(2); - gTasks[taskId].func = task; + Task_DoUseItemAnim(taskId); + gItemUseCB = ItemUseCB_ResetEVsStep; } }