Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-10-01 05:20:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor fresh start mochi item use

Browse Source
This commit is contained in:
cawtds
2024-06-04 21:20:55 +02:00
parent cb64e6f676
commit 90f3b961a6
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/maps/ViridianCity_Mart/scripts.inc
View File

@@ -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

22
src/party_menu.c
View File

@@ -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;
}
}