summaryrefslogtreecommitdiff
path: root/src/wallclock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallclock.c')
-rw-r--r--src/wallclock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallclock.c b/src/wallclock.c
index c38dd99e3..70888ac5f 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -147,7 +147,7 @@ static const struct SpritePalette sSpritePalettes_Clock[] =
static const struct OamData sOam_ClockHand =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.shape = SPRITE_SHAPE(64x64),
.size = SPRITE_SIZE(64x64),
.priority = 1,
@@ -199,7 +199,7 @@ static const struct SpriteTemplate sSpriteTemplate_HourHand =
static const struct OamData sOam_PeriodIndicator =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.shape = SPRITE_SHAPE(16x16),
.size = SPRITE_SIZE(16x16),
.priority = 3,
@@ -665,7 +665,7 @@ static void LoadWallClockGraphics(void)
static void WallClockInit(void)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(VBlankCB_WallClock);
SetMainCallback2(CB2_WallClock);
@@ -856,7 +856,7 @@ static void Task_SetClock_HandleConfirmInput(u8 taskId)
static void Task_SetClock_Confirmed(u8 taskId)
{
RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes);
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_SetClock_Exit;
}
@@ -884,7 +884,7 @@ static void Task_ViewClock_HandleInput(u8 taskId)
static void Task_ViewClock_FadeOut(u8 taskId)
{
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_ViewClock_Exit;
}