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/battle/battle_7.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/battle/battle_7.c')
| -rw-r--r-- | src/battle/battle_7.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index fe1d0b159..8766b5b77 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -86,7 +86,7 @@ void sub_80328A4(struct Sprite *); void sub_80312F0(struct Sprite *sprite) { - u8 spriteId = sprite->data1; + u8 spriteId = sprite->data[1]; if (gSprites[spriteId].affineAnimEnded && !gSprites[spriteId].invisible) { @@ -116,7 +116,7 @@ void sub_80313A0(struct Sprite *sprite) { if (!(gUnknown_02024DE8 & 1)) { - sprite->pos2.x += sprite->data0; + sprite->pos2.x += sprite->data[0]; if (sprite->pos2.x == 0) sprite->callback = SpriteCallbackDummy; } @@ -858,19 +858,19 @@ void sub_80327CC(void) LoadCompressedObjectPic(&gUnknown_081FAF24); r5 = GetBankByPlayerAI(1); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); - gSprites[ewram17810[r5].unk7].data0 = r5; + gSprites[ewram17810[r5].unk7].data[0] = r5; if (IsDoubleBattle()) { r5 = GetBankByPlayerAI(3); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, sub_8077ABC(r5, 0), sub_8077ABC(r5, 1) + 32, 0xC8); - gSprites[ewram17810[r5].unk7].data0 = r5; + gSprites[ewram17810[r5].unk7].data[0] = r5; } } void sub_80328A4(struct Sprite *sprite) { bool8 invisible = FALSE; - u8 r4 = sprite->data0; + u8 r4 = sprite->data[0]; struct Sprite *r7 = &gSprites[gObjectBankIDs[r4]]; if (!r7->inUse || AnimBankSpriteExists(r4) == 0) |