From 1deccbb930cb022b1e7112c3dc4aa148a34b9f35 Mon Sep 17 00:00:00 2001 From: Lucie Date: Mon, 17 Feb 2025 00:54:07 +0000 Subject: [PATCH] fix merge --- .../poketch_digital_clock_graphics.c | 8 ++++---- src/poketch_digital_clock/poketch_digital_clock_manager.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/poketch_digital_clock/poketch_digital_clock_graphics.c b/src/poketch_digital_clock/poketch_digital_clock_graphics.c index 537381348e..3ce363d0b8 100644 --- a/src/poketch_digital_clock/poketch_digital_clock_graphics.c +++ b/src/poketch_digital_clock/poketch_digital_clock_graphics.c @@ -58,7 +58,7 @@ BOOL PoketchDigitalClock_SetupDisplayData(DisplayData **displayData, const Clock PoketchTask_InitActiveTaskList(newDisplayData->taskList, NUM_TASK_SLOTS); newDisplayData->clockData = clockData; - newDisplayData->bgConfig = ov25_02254674(); + newDisplayData->bgConfig = Poketch_GetBgConfig(); void *nscrBuffer = Graphics_GetScrnData(NARC_INDEX_GRAPHIC__POKETCH, POKETCH_CLOCK_DIGITS_TILEMAP_IDX, TRUE, &screenData, HEAP_ID_POKETCH_APP); @@ -151,7 +151,7 @@ static void PoketchDigitalClock_SetupBackground(SysTask *sysTask, void *taskMana Graphics_LoadTilesToBgLayer(NARC_INDEX_GRAPHIC__POKETCH, PRE_POKETCH_DISPLAY_NARC_TILES_IDX, displayData->bgConfig, BG_LAYER_SUB_2, 0, 0, TRUE, HEAP_ID_POKETCH_APP); Graphics_LoadTilemapToBgLayer(NARC_INDEX_GRAPHIC__POKETCH, PRE_POKETCH_DISPLAY_NARC_TILEMAP_IDX, displayData->bgConfig, BG_LAYER_SUB_2, 0, 0, TRUE, HEAP_ID_POKETCH_APP); - ov25_022546B8(0, 0); + Poketch_LoadActivePalette(0, 0); PoketchDigitalClock_DrawClockDigits(displayData); Bg_CopyTilemapBufferToVRAM(displayData->bgConfig, BG_LAYER_SUB_2); @@ -175,9 +175,9 @@ static void PoketchDigitalClock_ToggleBacklightPalette(SysTask *sysTask, void *t DisplayData *displayData = PoketchTask_GetTaskData(taskManager); if (displayData->clockData->backlightActive) { - ov25_022546F0(0, 0); + Poketch_LoadActiveBacklightPalette(0, 0); } else { - ov25_022546B8(0, 0); + Poketch_LoadActivePalette(0, 0); } PoketchDigitalClock_EndTask(taskManager); diff --git a/src/poketch_digital_clock/poketch_digital_clock_manager.c b/src/poketch_digital_clock/poketch_digital_clock_manager.c index 1235d67016..1027642562 100644 --- a/src/poketch_digital_clock/poketch_digital_clock_manager.c +++ b/src/poketch_digital_clock/poketch_digital_clock_manager.c @@ -133,7 +133,7 @@ static void PoketchDigitalClock_AppTaskRunner(SysTask *sysTask, void *callbackDa AppData *appData = (AppData *)callbackData; if (appData->appTasktaskID < NELEMS(funcArray)) { - ov25_02254518(appData->poketchSys, appData->buttonManager); + PoketechSystem_UpdateButtonManager(appData->poketchSys, appData->buttonManager); if (funcArray[appData->appTasktaskID](appData)) { PoketchDigitalClock_FreeAppData(appData);