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

fix merge

Browse Source
This commit is contained in:
Lucie
2025-02-17 00:54:07 +00:00
parent cb954e4b48
commit 1deccbb930
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/poketch_digital_clock/poketch_digital_clock_graphics.c
View File

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

2
src/poketch_digital_clock/poketch_digital_clock_manager.c
View File

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