diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-18 22:15:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-18 22:15:38 -0800 |
commit | 4a365e9230962daf875a0444d51d76639c07c827 (patch) | |
tree | be7332caa25d9711fd12921e347332993e5b0ff1 /src/field/pokeblock.c | |
parent | 8edb453c9de6459f4da78522b248a2e507ba1f08 (diff) | |
parent | 79650185e2af1748a9728f6e9209d64f93cdb050 (diff) |
Merge pull request #462 from ProjectRevoTPP/sprite_struct
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'src/field/pokeblock.c')
-rw-r--r-- | src/field/pokeblock.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index a4497295f..5aa03ff7a 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -971,25 +971,25 @@ static void sub_810C854(u8 taskId) static void sub_810C8D4(struct Sprite *sprite) { - if (sprite->data0 > 1) + if (sprite->data[0] > 1) { - sprite->data0 = 0; + sprite->data[0] = 0; } - switch (sprite->data0) + switch (sprite->data[0]) { case 0: sprite->oam.affineMode = 1; sprite->affineAnims = gSpriteAffineAnimTable_83F7F70; InitSpriteAffineAnim(sprite); - sprite->data0 = 1; - sprite->data1 = 0; + sprite->data[0] = 1; + sprite->data[1] = 0; break; case 1: - if (++sprite->data1 > 11) + if (++sprite->data[1] > 11) { sprite->oam.affineMode = 0; - sprite->data0 = 0; - sprite->data1 = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; FreeOamMatrix(sprite->oam.matrixNum); sprite->callback = SpriteCallbackDummy; } |