diff options
Diffstat (limited to 'src/wallclock.c')
| -rw-r--r-- | src/wallclock.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/wallclock.c b/src/wallclock.c index 4d1c1fd8f..6f9bc02ae 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, @@ -1029,8 +1029,8 @@ static void SpriteCB_MinuteHand(struct Sprite *sprite) if (y > 128) y |= 0xff00; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; } static void SpriteCB_HourHand(struct Sprite *sprite) @@ -1049,8 +1049,8 @@ static void SpriteCB_HourHand(struct Sprite *sprite) if (y > 128) y |= 0xff00; - sprite->pos2.x = x; - sprite->pos2.y = y; + sprite->x2 = x; + sprite->y2 = y; } static void SpriteCB_PMIndicator(struct Sprite *sprite) @@ -1077,8 +1077,8 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite) sprite->data[1]--; } } - sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000; - sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000; + sprite->x2 = Cos2(sprite->data[1]) * 30 / 0x1000; + sprite->y2 = Sin2(sprite->data[1]) * 30 / 0x1000; } static void SpriteCB_AMIndicator(struct Sprite *sprite) @@ -1105,6 +1105,6 @@ static void SpriteCB_AMIndicator(struct Sprite *sprite) sprite->data[1]--; } } - sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000; - sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000; + sprite->x2 = Cos2(sprite->data[1]) * 30 / 0x1000; + sprite->y2 = Sin2(sprite->data[1]) * 30 / 0x1000; } |