diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-27 18:02:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 18:02:00 -0400 |
| commit | 459b20d762ac2d78f59874548bf9226af0f7f709 (patch) | |
| tree | 2df164beeac193a8180e4bd6a0fba15fd8713d90 /src/reset_rtc_screen.c | |
| parent | 80c77fc120259857f77e30c7cbb68857904c7fc0 (diff) | |
| parent | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (diff) | |
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/reset_rtc_screen.c')
| -rw-r--r-- | src/reset_rtc_screen.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index cc4da7e16..528a0e52d 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -243,36 +243,36 @@ static void SpriteCB_Cursor_UpOrRight(struct Sprite *sprite) sprite->invisible = FALSE; sprite->animNum = ARROW_UP; sprite->animDelayCounter = 0; - sprite->pos1.x = 53; - sprite->pos1.y = 68; + sprite->x = 53; + sprite->y = 68; break; case SELECTION_HOURS: sprite->invisible = FALSE; sprite->animNum = ARROW_UP; sprite->animDelayCounter = 0; - sprite->pos1.x = 86; - sprite->pos1.y = 68; + sprite->x = 86; + sprite->y = 68; break; case SELECTION_MINS: sprite->invisible = FALSE; sprite->animNum = ARROW_UP; sprite->animDelayCounter = 0; - sprite->pos1.x = 101; - sprite->pos1.y = 68; + sprite->x = 101; + sprite->y = 68; break; case SELECTION_SECS: sprite->invisible = FALSE; sprite->animNum = ARROW_UP; sprite->animDelayCounter = 0; - sprite->pos1.x = 116; - sprite->pos1.y = 68; + sprite->x = 116; + sprite->y = 68; break; case SELECTION_CONFIRM: sprite->invisible = FALSE; sprite->animNum = ARROW_RIGHT; sprite->animDelayCounter = 0; - sprite->pos1.x = 153; - sprite->pos1.y = 80; + sprite->x = 153; + sprite->y = 80; break; case SELECTION_NONE: DestroySprite(sprite); @@ -293,29 +293,29 @@ static void SpriteCB_Cursor_Down(struct Sprite *sprite) sprite->invisible = FALSE; sprite->animNum = ARROW_DOWN; sprite->animDelayCounter = 0; - sprite->pos1.x = 53; - sprite->pos1.y = 92; + sprite->x = 53; + sprite->y = 92; break; case SELECTION_HOURS: sprite->invisible = FALSE; sprite->animNum = ARROW_DOWN; sprite->animDelayCounter = 0; - sprite->pos1.x = 86; - sprite->pos1.y = 92; + sprite->x = 86; + sprite->y = 92; break; case SELECTION_MINS: sprite->invisible = FALSE; sprite->animNum = ARROW_DOWN; sprite->animDelayCounter = 0; - sprite->pos1.x = 101; - sprite->pos1.y = 92; + sprite->x = 101; + sprite->y = 92; break; case SELECTION_SECS: sprite->invisible = FALSE; sprite->animNum = ARROW_DOWN; sprite->animDelayCounter = 0; - sprite->pos1.x = 116; - sprite->pos1.y = 92; + sprite->x = 116; + sprite->y = 92; break; case SELECTION_CONFIRM: // The up arrow is used as a right arrow when Confirm is selected |