dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallclock.c
+5 -5
View File
@@ -647,17 +647,17 @@ static void LoadWallClockGraphics(void)
LZ77UnCompVram(gWallClock_Gfx, (void *)VRAM);
if (gSpecialVar_0x8004 == MALE)
LoadPalette(gWallClockMale_Pal, 0, 32);
LoadPalette(gWallClockMale_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
else
LoadPalette(gWallClockFemale_Pal, 0, 32);
LoadPalette(gWallClockFemale_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 32);
LoadPalette(sTextPrompt_Pal, 0xc0, 8);
LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(14), PLTT_SIZE_4BPP);
LoadPalette(sTextPrompt_Pal, BG_PLTT_ID(12), PLTT_SIZEOF(4));
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 0x250, 0xd0);
LoadUserWindowBorderGfx(0, 0x250, BG_PLTT_ID(13));
ClearScheduledBgCopiesToVram();
ScanlineEffect_Stop();
ResetTasks();