ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
DizzyEggg 2020-07-11 12:58:59 +02:00
parent e03fea84d0
commit da3062097a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/party_menu.c
View File

@ -4410,7 +4410,7 @@ void Task_AbilityCapsule(u8 taskId)
gPartyMenuUseExitCallback = FALSE;
PlaySE(SE_SELECT);
DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
schedule_bg_copy_tilemap_to_vram(2);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = Task_ClosePartyMenuAfterText;
return;
}
@ -4420,7 +4420,7 @@ void Task_AbilityCapsule(u8 taskId)
StringExpandPlaceholders(gStringVar4, askText);
PlaySE(SE_SELECT);
DisplayPartyMenuMessage(gStringVar4, 1);
schedule_bg_copy_tilemap_to_vram(2);
ScheduleBgCopyTilemapToVram(2);
tState++;
break;
case 1:
@ -4440,7 +4440,7 @@ void Task_AbilityCapsule(u8 taskId)
case MENU_B_PRESSED:
gPartyMenuUseExitCallback = FALSE;
PlaySE(SE_SELECT);
schedule_bg_copy_tilemap_to_vram(2);
ScheduleBgCopyTilemapToVram(2);
// Don't exit party selections screen, return to choosing a mon.
ClearStdWindowAndFrameToTransparent(6, 0);
ClearWindowTilemap(6);
@ -4453,7 +4453,7 @@ void Task_AbilityCapsule(u8 taskId)
PlaySE(SE_KAIFUKU);
StringExpandPlaceholders(gStringVar4, doneText);
DisplayPartyMenuMessage(gStringVar4, 1);
schedule_bg_copy_tilemap_to_vram(2);
ScheduleBgCopyTilemapToVram(2);
tState++;
break;
case 4: