Merge branch 'master' into doc-link
This commit is contained in:
104
src/party_menu.c
104
src/party_menu.c
@@ -479,7 +479,7 @@ static void CB2_InitPartyMenu(void)
|
||||
{
|
||||
while (TRUE)
|
||||
{
|
||||
if (sub_81221EC() == TRUE || ShowPartyMenu() == TRUE || sub_81221AC() == TRUE)
|
||||
if (MenuHelpers_CallLinkSomething() == TRUE || ShowPartyMenu() == TRUE || MenuHelpers_LinkSomething() == TRUE)
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -512,7 +512,7 @@ static bool8 ShowPartyMenu(void)
|
||||
gMain.state++;
|
||||
break;
|
||||
case 5:
|
||||
if (!sub_81221AC())
|
||||
if (!MenuHelpers_LinkSomething())
|
||||
ResetTasks();
|
||||
gMain.state++;
|
||||
break;
|
||||
@@ -645,7 +645,7 @@ static bool8 AllocPartyMenuBg(void)
|
||||
InitBgsFromTemplates(0, sPartyMenuBgTemplates, ARRAY_COUNT(sPartyMenuBgTemplates));
|
||||
SetBgTilemapBuffer(1, sPartyBgTilemapBuffer);
|
||||
ResetAllBgsCoordinates();
|
||||
schedule_bg_copy_tilemap_to_vram(1);
|
||||
ScheduleBgCopyTilemapToVram(1);
|
||||
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
|
||||
SetGpuReg(REG_OFFSET_BLDCNT, 0);
|
||||
ShowBg(0);
|
||||
@@ -759,7 +759,7 @@ static void RenderPartyMenuBox(u8 slot)
|
||||
LoadPartyBoxPalette(&sPartyMenuBoxes[slot], PARTY_PAL_MULTI_ALT);
|
||||
CopyWindowToVram(sPartyMenuBoxes[slot].windowId, 2);
|
||||
PutWindowTilemap(sPartyMenuBoxes[slot].windowId);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -792,7 +792,7 @@ static void RenderPartyMenuBox(u8 slot)
|
||||
AnimatePartySlot(slot, 0);
|
||||
}
|
||||
PutWindowTilemap(sPartyMenuBoxes[slot].windowId);
|
||||
schedule_bg_copy_tilemap_to_vram(0);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1086,7 +1086,7 @@ void AnimatePartySlot(u8 slot, u8 animNum)
|
||||
break;
|
||||
}
|
||||
PartyMenuStartSpriteAnim(spriteId, animNum);
|
||||
schedule_bg_copy_tilemap_to_vram(1);
|
||||
ScheduleBgCopyTilemapToVram(1);
|
||||
}
|
||||
|
||||
static u8 GetPartyBoxPaletteFlags(u8 slot, u8 animNum)
|
||||
@@ -1127,7 +1127,7 @@ static void DrawCancelConfirmButtons(void)
|
||||
{
|
||||
CopyToBgTilemapBufferRect_ChangePalette(1, sConfirmButton_Tilemap, 23, 16, 7, 2, 17);
|
||||
CopyToBgTilemapBufferRect_ChangePalette(1, sCancelButton_Tilemap, 23, 18, 7, 2, 17);
|
||||
schedule_bg_copy_tilemap_to_vram(1);
|
||||
ScheduleBgCopyTilemapToVram(1);
|
||||
}
|
||||
|
||||
bool8 IsMultiBattle(void)
|
||||
@@ -1185,7 +1185,7 @@ u8 GetPartyMenuType(void)
|
||||
|
||||
void Task_HandleChooseMonInput(u8 taskId)
|
||||
{
|
||||
if (!gPaletteFade.active && sub_81221EC() != TRUE)
|
||||
if (!gPaletteFade.active && MenuHelpers_CallLinkSomething() != TRUE)
|
||||
{
|
||||
s8 *slotPtr = GetCurrentPartySlotPtr();
|
||||
|
||||
@@ -1322,7 +1322,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
|
||||
PlaySE(SE_SELECT);
|
||||
if (DisplayCancelChooseMonYesNo(taskId) != TRUE)
|
||||
{
|
||||
if (!sub_81221AC())
|
||||
if (!MenuHelpers_LinkSomething())
|
||||
gSpecialVar_0x8004 = PARTY_SIZE + 1;
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
*slotPtr = PARTY_SIZE + 1;
|
||||
@@ -1662,7 +1662,7 @@ bool8 IsPartyMenuTextPrinterActive(void)
|
||||
|
||||
static void Task_WaitForLinkAndReturnToChooseMon(u8 taskId)
|
||||
{
|
||||
if (sub_81221EC() != TRUE)
|
||||
if (MenuHelpers_CallLinkSomething() != TRUE)
|
||||
{
|
||||
DisplayPartyMenuStdMessage(PARTY_MSG_CHOOSE_MON);
|
||||
gTasks[taskId].func = Task_HandleChooseMonInput;
|
||||
@@ -1675,7 +1675,7 @@ static void Task_ReturnToChooseMonAfterText(u8 taskId)
|
||||
{
|
||||
ClearStdWindowAndFrameToTransparent(6, 0);
|
||||
ClearWindowTilemap(6);
|
||||
if (sub_81221AC() == TRUE)
|
||||
if (MenuHelpers_LinkSomething() == TRUE)
|
||||
{
|
||||
gTasks[taskId].func = Task_WaitForLinkAndReturnToChooseMon;
|
||||
}
|
||||
@@ -1693,7 +1693,7 @@ static void DisplayGaveHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keep
|
||||
CopyItemName(item, gStringVar2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnWasGivenItem);
|
||||
DisplayPartyMenuMessage(gStringVar4, keepOpen);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void DisplayTookHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keepOpen)
|
||||
@@ -1702,7 +1702,7 @@ static void DisplayTookHeldItemMessage(struct Pokemon *mon, u16 item, bool8 keep
|
||||
CopyItemName(item, gStringVar2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_ReceivedItemFromPkmn);
|
||||
DisplayPartyMenuMessage(gStringVar4, keepOpen);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void DisplayAlreadyHoldingItemSwitchMessage(struct Pokemon *mon, u16 item, bool8 keepOpen)
|
||||
@@ -1711,7 +1711,7 @@ static void DisplayAlreadyHoldingItemSwitchMessage(struct Pokemon *mon, u16 item
|
||||
CopyItemName(item, gStringVar2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyHoldingItemSwitch);
|
||||
DisplayPartyMenuMessage(gStringVar4, keepOpen);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void DisplaySwitchedHeldItemMessage(u16 item, u16 item2, bool8 keepOpen)
|
||||
@@ -1720,7 +1720,7 @@ static void DisplaySwitchedHeldItemMessage(u16 item, u16 item2, bool8 keepOpen)
|
||||
CopyItemName(item2, gStringVar2);
|
||||
StringExpandPlaceholders(gStringVar4, gText_SwitchedPkmnItem);
|
||||
DisplayPartyMenuMessage(gStringVar4, keepOpen);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void GiveItemToMon(struct Pokemon *mon, u16 item)
|
||||
@@ -1919,7 +1919,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot)
|
||||
{
|
||||
PlaySE(SE_HAZURE);
|
||||
DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
|
||||
}
|
||||
}
|
||||
@@ -1927,7 +1927,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot)
|
||||
static void CancelParticipationPrompt(u8 taskId)
|
||||
{
|
||||
DisplayPartyMenuMessage(gText_CancelParticipation, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_CancelParticipationYesNo;
|
||||
}
|
||||
|
||||
@@ -2067,7 +2067,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf)
|
||||
}
|
||||
PutWindowTilemap(cancelWindowId);
|
||||
CopyWindowToVram(cancelWindowId, 2);
|
||||
schedule_bg_copy_tilemap_to_vram(0);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2381,7 +2381,7 @@ static void PartyMenuRemoveWindow(u8 *ptr)
|
||||
ClearStdWindowAndFrameToTransparent(*ptr, 0);
|
||||
RemoveWindow(*ptr);
|
||||
*ptr = 0xFF;
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2427,7 +2427,7 @@ void DisplayPartyMenuStdMessage(u32 stringId)
|
||||
DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x4F, 0xD);
|
||||
StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]);
|
||||
AddTextPrinterParameterized(*windowPtr, 1, gStringVar4, 0, 1, 0, 0);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2487,7 +2487,7 @@ static u8 DisplaySelectionWindow(u8 windowType)
|
||||
}
|
||||
|
||||
InitMenuInUpperLeftCorner(sPartyMenuInternal->windowId[0], sPartyMenuInternal->numActions, 0, 1);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
|
||||
return sPartyMenuInternal->windowId[0];
|
||||
}
|
||||
@@ -2649,7 +2649,7 @@ static bool8 CreateSelectionWindow(u8 taskId)
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnNotHolding);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_UpdateHeldItemSprite;
|
||||
return FALSE;
|
||||
}
|
||||
@@ -2668,7 +2668,7 @@ static void Task_TryCreateSelectionWindow(u8 taskId)
|
||||
|
||||
static void Task_HandleSelectionMenuInput(u8 taskId)
|
||||
{
|
||||
if (!gPaletteFade.active && sub_81221EC() != TRUE)
|
||||
if (!gPaletteFade.active && MenuHelpers_CallLinkSomething() != TRUE)
|
||||
{
|
||||
s8 input;
|
||||
s16 *data = gTasks[taskId].data;
|
||||
@@ -2860,7 +2860,7 @@ static void SlidePartyMenuBoxOneStep(u8 taskId)
|
||||
MoveAndBufferPartySlot(sSlot1TilemapBuffer, tSlot1Left + tSlot1Offset, tSlot1Top, tSlot1Width, tSlot1Height, tSlot1SlideDir);
|
||||
if (tSlot2SlideDir != 0)
|
||||
MoveAndBufferPartySlot(sSlot2TilemapBuffer, tSlot2Left + tSlot2Offset, tSlot2Top, tSlot2Width, tSlot2Height, tSlot2SlideDir);
|
||||
schedule_bg_copy_tilemap_to_vram(0);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
}
|
||||
|
||||
static void Task_SlideSelectedSlotsOffscreen(u8 taskId)
|
||||
@@ -2905,7 +2905,7 @@ static void Task_SlideSelectedSlotsOnscreen(u8 taskId)
|
||||
{
|
||||
PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId].windowId);
|
||||
PutWindowTilemap(sPartyMenuBoxes[gPartyMenu.slotId2].windowId);
|
||||
schedule_bg_copy_tilemap_to_vram(0);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
Free(sSlot1TilemapBuffer);
|
||||
Free(sSlot2TilemapBuffer);
|
||||
FinishTwoMonAction(taskId);
|
||||
@@ -3023,7 +3023,7 @@ static void CursorCb_Give(u8 taskId)
|
||||
static void CB2_SelectBagItemToGive(void)
|
||||
{
|
||||
if (InBattlePyramid() == FALSE)
|
||||
GoToBagMenu(RETURN_LOCATION_POKEMON_LIST, POCKETS_COUNT, CB2_GiveHoldItem);
|
||||
GoToBagMenu(ITEMMENULOCATION_PARTY, POCKETS_COUNT, CB2_GiveHoldItem);
|
||||
else
|
||||
GoToBattlePyramidBagMenu(2, CB2_GiveHoldItem);
|
||||
}
|
||||
@@ -3223,7 +3223,7 @@ static void CursorCb_TakeItem(u8 taskId)
|
||||
DisplayTookHeldItemMessage(mon, item, TRUE);
|
||||
break;
|
||||
}
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_UpdateHeldItemSprite;
|
||||
}
|
||||
|
||||
@@ -3640,7 +3640,7 @@ static void CursorCb_FieldMove(u8 taskId)
|
||||
|
||||
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
|
||||
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
|
||||
if (sub_81221AC() == TRUE || InUnionRoom() == TRUE)
|
||||
if (MenuHelpers_LinkSomething() == TRUE || InUnionRoom() == TRUE)
|
||||
{
|
||||
if (fieldMove == FIELD_MOVE_MILK_DRINK || fieldMove == FIELD_MOVE_SOFT_BOILED)
|
||||
DisplayPartyMenuStdMessage(PARTY_MSG_CANT_USE_HERE);
|
||||
@@ -4206,7 +4206,7 @@ void CB2_ShowPartyMenuForItemUse(void)
|
||||
static void CB2_ReturnToBagMenu(void)
|
||||
{
|
||||
if (InBattlePyramid() == FALSE)
|
||||
GoToBagMenu(RETURN_LOCATION_UNCHANGED, POCKETS_COUNT, NULL);
|
||||
GoToBagMenu(ITEMMENULOCATION_LAST, POCKETS_COUNT, NULL);
|
||||
else
|
||||
GoToBattlePyramidBagMenu(4, gPyramidBagCursorData.callback);
|
||||
}
|
||||
@@ -4345,7 +4345,7 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
PlaySE(SE_SELECT);
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
return;
|
||||
}
|
||||
@@ -4381,7 +4381,7 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
|
||||
GetMonNickname(mon, gStringVar1);
|
||||
GetMedicineItemEffectMessage(item);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
}
|
||||
}
|
||||
@@ -4391,7 +4391,7 @@ static void Task_DisplayHPRestoredMessage(u8 taskId)
|
||||
GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
|
||||
DisplayPartyMenuMessage(gStringVar4, FALSE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
HandleBattleLowHpMusicChange();
|
||||
gTasks[taskId].func = Task_ClosePartyMenuAfterText;
|
||||
}
|
||||
@@ -4422,7 +4422,7 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task)
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
PlaySE(SE_SELECT);
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
}
|
||||
else
|
||||
@@ -4444,7 +4444,7 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task)
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnAdoresBaseVar2Fell);
|
||||
}
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
}
|
||||
}
|
||||
@@ -4512,7 +4512,7 @@ static void ShowMoveSelectWindow(u8 slot)
|
||||
moveCount++;
|
||||
}
|
||||
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, moveCount, 0);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void Task_HandleWhichMoveInput(u8 taskId)
|
||||
@@ -4586,7 +4586,7 @@ static void TryUsePPItem(u8 taskId)
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
PlaySE(SE_SELECT);
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_ClosePartyMenuAfterText;
|
||||
}
|
||||
else
|
||||
@@ -4599,7 +4599,7 @@ static void TryUsePPItem(u8 taskId)
|
||||
StringCopy(gStringVar1, gMoveNames[move]);
|
||||
GetMedicineItemEffectMessage(item);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_ClosePartyMenuAfterText;
|
||||
}
|
||||
}
|
||||
@@ -4646,7 +4646,7 @@ static void DisplayLearnMoveMessage(const u8 *str)
|
||||
{
|
||||
StringExpandPlaceholders(gStringVar4, str);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void DisplayLearnMoveMessageAndClose(u8 taskId, const u8 *str)
|
||||
@@ -4709,7 +4709,7 @@ static void Task_LearnedMove(u8 taskId)
|
||||
StringCopy(gStringVar2, gMoveNames[move[0]]);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText;
|
||||
}
|
||||
|
||||
@@ -4824,7 +4824,7 @@ static void StopLearningMovePrompt(u8 taskId)
|
||||
StringCopy(gStringVar2, gMoveNames[gPartyMenu.data1]);
|
||||
StringExpandPlaceholders(gStringVar4, gText_StopLearningMove2);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_StopLearningMoveYesNo;
|
||||
}
|
||||
|
||||
@@ -4900,7 +4900,7 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task)
|
||||
{
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
}
|
||||
else
|
||||
@@ -4913,7 +4913,7 @@ void ItemUseCB_RareCandy(u8 taskId, TaskFunc task)
|
||||
ConvertIntToDecimalStringN(gStringVar2, GetMonData(mon, MON_DATA_LEVEL), STR_CONV_MODE_LEFT_ALIGN, 3);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnElevatedToLvVar2);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_DisplayLevelUpStatsPg1;
|
||||
}
|
||||
}
|
||||
@@ -4928,7 +4928,7 @@ static void UpdateMonDisplayInfoAfterRareCandy(u8 slot, struct Pokemon *mon)
|
||||
DisplayPartyPokemonHPBarCheck(mon, &sPartyMenuBoxes[slot]);
|
||||
UpdatePartyMonHPBar(sPartyMenuBoxes[slot].monSpriteId, mon);
|
||||
AnimatePartySlot(slot, 1);
|
||||
schedule_bg_copy_tilemap_to_vram(0);
|
||||
ScheduleBgCopyTilemapToVram(0);
|
||||
}
|
||||
|
||||
static void Task_DisplayLevelUpStatsPg1(u8 taskId)
|
||||
@@ -4958,7 +4958,7 @@ static void DisplayLevelUpStatsPg1(u8 taskId)
|
||||
arrayPtr[12] = CreateLevelUpStatsWindow();
|
||||
DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
|
||||
CopyWindowToVram(arrayPtr[12], 2);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void DisplayLevelUpStatsPg2(u8 taskId)
|
||||
@@ -4967,7 +4967,7 @@ static void DisplayLevelUpStatsPg2(u8 taskId)
|
||||
|
||||
DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
|
||||
CopyWindowToVram(arrayPtr[12], 2);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
|
||||
static void Task_TryLearnNewMoves(u8 taskId)
|
||||
@@ -5041,7 +5041,7 @@ static void DisplayMonNeedsToReplaceMove(u8 taskId)
|
||||
StringCopy(gStringVar2, gMoveNames[gMoveToLearn]);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnNeedsToReplaceMove);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gPartyMenu.data1 = gMoveToLearn;
|
||||
gTasks[taskId].func = Task_ReplaceMoveYesNo;
|
||||
}
|
||||
@@ -5052,7 +5052,7 @@ static void DisplayMonLearnedMove(u8 taskId, u16 move)
|
||||
StringCopy(gStringVar2, gMoveNames[move]);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnLearnedMove3);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gPartyMenu.data1 = move;
|
||||
gTasks[taskId].func = Task_DoLearnedMoveFanfareAfterText;
|
||||
}
|
||||
@@ -5124,7 +5124,7 @@ static void Task_SacredAshLoop(u8 taskId)
|
||||
{
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -5146,7 +5146,7 @@ static void Task_SacredAshDisplayHPRestored(u8 taskId)
|
||||
GetMonNickname(&gPlayerParty[gPartyMenu.slotId], gStringVar1);
|
||||
StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
|
||||
DisplayPartyMenuMessage(gStringVar4, FALSE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_SacredAshLoop;
|
||||
}
|
||||
|
||||
@@ -5162,7 +5162,7 @@ void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc task)
|
||||
{
|
||||
gPartyMenuUseExitCallback = FALSE;
|
||||
DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = task;
|
||||
}
|
||||
else
|
||||
@@ -5440,7 +5440,7 @@ static void Task_HandleSwitchItemsFromBagYesNoInput(u8 taskId)
|
||||
static void DisplayItemMustBeRemovedFirstMessage(u8 taskId)
|
||||
{
|
||||
DisplayPartyMenuMessage(gText_RemoveMailBeforeItem, TRUE);
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
|
||||
}
|
||||
|
||||
@@ -5484,7 +5484,7 @@ static void TryGiveMailToSelectedMon(u8 taskId)
|
||||
ClearMailStruct(mail);
|
||||
DisplayPartyMenuMessage(gText_MailTransferredFromMailbox, TRUE);
|
||||
}
|
||||
schedule_bg_copy_tilemap_to_vram(2);
|
||||
ScheduleBgCopyTilemapToVram(2);
|
||||
gTasks[taskId].func = Task_UpdateHeldItemSpriteAndClosePartyMenu;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user