diff options
Diffstat (limited to 'src/pokemon_summary_screen.c')
-rw-r--r-- | src/pokemon_summary_screen.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index fc0e432bd..e8b30f773 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1133,7 +1133,7 @@ static void VBlank(void) static void CB2_InitSummaryScreen(void) { - while (sub_81221EC() != TRUE && LoadGraphics() != TRUE && sub_81221AC() != TRUE); + while (MenuHelpers_CallLinkSomething() != TRUE && LoadGraphics() != TRUE && MenuHelpers_LinkSomething() != TRUE); } static bool8 LoadGraphics(void) @@ -1271,9 +1271,9 @@ static void InitBGs(void) SetBgTilemapBuffer(2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0]); SetBgTilemapBuffer(3, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]); ResetAllBgsCoordinates(); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); + ScheduleBgCopyTilemapToVram(3); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_BLDCNT, 0); ShowBg(0); @@ -1287,12 +1287,12 @@ static bool8 DecompressGraphics(void) switch (sMonSummaryScreen->switchCounter) { case 0: - reset_temp_tile_data_buffers(); - decompress_and_copy_tile_data_to_vram(1, &gStatusScreenBitmap, 0, 0, 0); + ResetTempTileDataBuffers(); + DecompressAndCopyTileDataToVram(1, &gStatusScreenBitmap, 0, 0, 0); sMonSummaryScreen->switchCounter++; break; case 1: - if (free_temp_tile_data_buffers_if_possible() != 1) + if (FreeTempTileDataBuffersIfPossible() != 1) { LZDecompressWram(gPageInfoTilemap, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0]); sMonSummaryScreen->switchCounter++; @@ -1477,7 +1477,7 @@ static void BeginCloseSummaryScreen(u8 taskId) static void CloseSummaryScreen(u8 taskId) { - if (sub_81221EC() != TRUE && !gPaletteFade.active) + if (MenuHelpers_CallLinkSomething() != TRUE && !gPaletteFade.active) { SetMainCallback2(sMonSummaryScreen->callback); gLastViewedMonIndex = sMonSummaryScreen->curMonIndex; @@ -1495,7 +1495,7 @@ static void CloseSummaryScreen(u8 taskId) static void Task_HandleInput(u8 taskId) { - if (sub_81221EC() != TRUE && !gPaletteFade.active) + if (MenuHelpers_CallLinkSomething() != TRUE && !gPaletteFade.active) { if (gMain.newKeys & DPAD_UP) { @@ -1579,7 +1579,7 @@ static void ChangeSummaryPokemon(u8 taskId, s8 delta) { SetSpriteInvisibility(SPRITE_ARR_ID_STATUS, TRUE); ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); HandleStatusTilemap(0, 2); } sMonSummaryScreen->curMonIndex = monId; @@ -1647,7 +1647,7 @@ static void Task_ChangeSummaryMon(u8 taskId) gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_MON]].data[2] = 0; break; default: - if (sub_81221EC() == 0 && FuncIsActiveTask(Task_ShowStatusWindow) == 0) + if (MenuHelpers_CallLinkSomething() == 0 && FuncIsActiveTask(Task_ShowStatusWindow) == 0) { data[0] = 0; gTasks[taskId].func = Task_HandleInput; @@ -1756,14 +1756,14 @@ static void PssScrollRight(u8 taskId) // Scroll right data[1] = 1; SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); - schedule_bg_copy_tilemap_to_vram(1); + ScheduleBgCopyTilemapToVram(1); } else { data[1] = 2; SetBgAttribute(2, BG_ATTR_PRIORITY, 1); SetBgAttribute(1, BG_ATTR_PRIORITY, 2); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); } ChangeBgX(data[1], 0, 0); SetBgTilemapBuffer(data[1], sMonSummaryScreen->bgTilemapBuffers[sMonSummaryScreen->currPageIndex][0]); @@ -1813,13 +1813,13 @@ static void PssScrollLeftEnd(u8 taskId) // display left { SetBgAttribute(1, BG_ATTR_PRIORITY, 1); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); } else { SetBgAttribute(2, BG_ATTR_PRIORITY, 1); SetBgAttribute(1, BG_ATTR_PRIORITY, 2); - schedule_bg_copy_tilemap_to_vram(1); + ScheduleBgCopyTilemapToVram(1); } if (sMonSummaryScreen->currPageIndex > 1) { @@ -1865,9 +1865,9 @@ static void SwitchToMoveSelection(u8 taskId) PrintMoveDetails(move); PrintNewMoveDetailsOrCancelText(); SetNewMoveTypeIcon(); - schedule_bg_copy_tilemap_to_vram(0); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(0); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); CreateMoveSelectorSprites(SPRITE_ARR_ID_MOVE_SELECTOR1); gTasks[taskId].func = Task_HandleInput_MoveSelect; } @@ -1876,7 +1876,7 @@ static void Task_HandleInput_MoveSelect(u8 taskId) { s16 *data = gTasks[taskId].data; - if (sub_81221EC() != 1) + if (MenuHelpers_CallLinkSomething() != 1) { if (gMain.newKeys & DPAD_UP) { @@ -1950,8 +1950,8 @@ static void ChangeSelectedMove(s16 *taskData, s8 direction, u8 *moveIndexPtr) break; } DrawContestMoveHearts(move); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); PrintMoveDetails(move); if ((*moveIndexPtr == MAX_MON_MOVES && sMonSummaryScreen->newMove == MOVE_NONE) || taskData[1] == 1) @@ -1959,7 +1959,7 @@ static void ChangeSelectedMove(s16 *taskData, s8 direction, u8 *moveIndexPtr) ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); if (!gSprites[sMonSummaryScreen->spriteIds[SPRITE_ARR_ID_STATUS]].invisible) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(9, -3); HandleAppealJamTilemap(9, -3, move); } @@ -1969,7 +1969,7 @@ static void ChangeSelectedMove(s16 *taskData, s8 direction, u8 *moveIndexPtr) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); } @@ -1998,9 +1998,9 @@ static void CloseMoveSelectMode(u8 taskId) HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); } - schedule_bg_copy_tilemap_to_vram(0); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(0); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_HandleInput; } @@ -2016,7 +2016,7 @@ static void Task_HandleInput_MovePositionSwitch(u8 taskId) { s16* data = gTasks[taskId].data; - if (sub_81221EC() != TRUE) + if (MenuHelpers_CallLinkSomething() != TRUE) { if (gMain.newKeys & DPAD_UP) { @@ -2071,8 +2071,8 @@ static void ExitMovePositionSwitchMode(u8 taskId, bool8 swapMoves) move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; PrintMoveDetails(move); DrawContestMoveHearts(move); - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_HandleInput_MoveSelect; } @@ -2157,7 +2157,7 @@ static void Task_HandleReplaceMoveInput(u8 taskId) { s16* data = gTasks[taskId].data; - if (sub_81221EC() != TRUE) + if (MenuHelpers_CallLinkSomething() != TRUE) { if (gPaletteFade.active != TRUE) { @@ -2221,7 +2221,7 @@ static void ShowCantForgetHMsWindow(u8 taskId) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); PrintHMMovesCantBeForgotten(); @@ -2286,7 +2286,7 @@ static void Task_HandleInputCantForgetHMsMoves(u8 taskId) ClearWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); move = sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]; PrintMoveDetails(move); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(9, -3); HandleAppealJamTilemap(9, -3, move); gTasks[taskId].func = Task_HandleReplaceMoveInput; @@ -2362,7 +2362,7 @@ static void DrawPagination(void) // Updates the pagination dots at the top of th } } CopyToBgTilemapBufferRect_ChangePalette(3, alloced, 11, 0, 8, 2, 16); - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(3); Free(alloced); } @@ -2435,11 +2435,11 @@ static void Task_ShowPowerAccWindow(u8 taskId) PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); DestroyTask(taskId); } - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); } static void HandleAppealJamTilemap(u16 a, s16 b, u16 move) @@ -2491,11 +2491,11 @@ static void Task_ShowAppealJamWindow(u8 taskId) } PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); } - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); DestroyTask(taskId); } - schedule_bg_copy_tilemap_to_vram(1); - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(1); + ScheduleBgCopyTilemapToVram(2); } static void HandleStatusTilemap(u16 a, s16 b) @@ -2525,14 +2525,14 @@ static void Task_ShowStatusWindow(u8 taskId) data[1] = sStatusTilemapCtrl1.field_6; ChangeTilemap(&sStatusTilemapCtrl1, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], FALSE); ChangeTilemap(&sStatusTilemapCtrl2, sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0], data[1], FALSE); - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(3); if (data[1] <= 0 || data[1] >= sStatusTilemapCtrl1.field_6) { if (data[0] < 0) { CreateSetStatusSprite(); PutWindowTilemap(PSS_LABEL_WINDOW_POKEMON_SKILLS_STATUS); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } DestroyTask(taskId); } @@ -2576,7 +2576,7 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][0][0x223] = 0x81A; sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_INFO][1][0x223] = 0x81A; } - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(3); } static void SetDexNumberColor(bool8 isMonShiny) @@ -2585,7 +2585,7 @@ static void SetDexNumberColor(bool8 isMonShiny) SetBgTilemapPalette(3, 1, 4, 8, 8, 0); else SetBgTilemapPalette(3, 1, 4, 8, 8, 5); - schedule_bg_copy_tilemap_to_vram(3); + ScheduleBgCopyTilemapToVram(3); } static void DrawExperienceProgressBar(struct Pokemon *unused) @@ -2625,9 +2625,9 @@ static void DrawExperienceProgressBar(struct Pokemon *unused) } if (GetBgTilemapBuffer(1) == sMonSummaryScreen->bgTilemapBuffers[PSS_PAGE_SKILLS][0]) - schedule_bg_copy_tilemap_to_vram(1); + ScheduleBgCopyTilemapToVram(1); else - schedule_bg_copy_tilemap_to_vram(2); + ScheduleBgCopyTilemapToVram(2); } static void DrawContestMoveHearts(u16 move) @@ -2698,7 +2698,7 @@ static void PrintMonInfo(void) PrintNotEggInfo(); else PrintEggInfo(); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } static void PrintNotEggInfo(void) @@ -2886,7 +2886,7 @@ static void PutPageWindowTilemaps(u8 page) for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) PutWindowTilemap(sMonSummaryScreen->windowIds[i]); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } static void ClearPageWindowTilemaps(u8 page) @@ -2933,7 +2933,7 @@ static void ClearPageWindowTilemaps(u8 page) for (i = 0; i < ARRAY_COUNT(sMonSummaryScreen->windowIds); i++) RemoveWindowByIndex(i); - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId) @@ -3629,7 +3629,7 @@ static void PrintMoveDetails(u16 move) ClearWindowTilemap(windowId); } - schedule_bg_copy_tilemap_to_vram(0); + ScheduleBgCopyTilemapToVram(0); } static void PrintNewMoveDetailsOrCancelText(void) @@ -3712,7 +3712,7 @@ static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible) static void HidePageSpecificSprites(void) { - // Keeps Pokémon, caught ball and status sprites visible. + // Keeps Pok�mon, caught ball and status sprites visible. u8 i; for (i = SPRITE_ARR_ID_TYPE; i < ARRAY_COUNT(sMonSummaryScreen->spriteIds); i++) |