diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-25 12:51:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-25 12:51:51 -0400 |
commit | 1150e16b68c5e6fc2c7baf56ab061cea69d69953 (patch) | |
tree | 55aafd11c76cb39fe2a83cc7839f5b0f7d7efa9c /src/overworld.c | |
parent | cd8ac0ed9b9e9f53979409bf1a99d62132e5001b (diff) | |
parent | aec808ac0d6266dc1c96ecf1aca998a06b11db19 (diff) |
Merge pull request #450 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/overworld.c')
-rw-r--r-- | src/overworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overworld.c b/src/overworld.c index a330ace3e..18d6aa2b2 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3536,8 +3536,8 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite) { struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]]; struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId]; - sprite->pos1.x = objEvent->initialCoords.x; - sprite->pos1.y = objEvent->initialCoords.y; + sprite->x = objEvent->initialCoords.x; + sprite->y = objEvent->initialCoords.y; SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); |