diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /src/mon_markings.c | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'src/mon_markings.c')
| -rw-r--r-- | src/mon_markings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mon_markings.c b/src/mon_markings.c index e71d6d795..dbd5a2fa8 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -493,7 +493,7 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base return; } } - sMenu->windowSprites[1]->pos1.y = y + 96; + sMenu->windowSprites[1]->y = y + 96; // Create marking sprites @@ -526,8 +526,8 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base sMenu->textSprite->oam.shape = SPRITE_SHAPE(32x32); sMenu->textSprite->oam.size = SPRITE_SIZE(32x32); StartSpriteAnim(sMenu->textSprite, ANIM_TEXT); - sMenu->textSprite->pos1.x = x + 32; - sMenu->textSprite->pos1.y = y + 80; + sMenu->textSprite->x = x + 32; + sMenu->textSprite->y = y + 80; CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF); } else @@ -567,7 +567,7 @@ static void SpriteCB_Marking(struct Sprite *sprite) static void SpriteCB_Cursor(struct Sprite *sprite) { - sprite->pos1.y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset; + sprite->y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset; } #undef sCursorYOffset |