diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 15:54:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-28 15:54:22 -0400 |
| commit | 27c5faf8e0e8a0f685ed61847a30eaf51b90c497 (patch) | |
| tree | 8d0c2c64dd5eed7f9f30db1a190236ca9b2f8fa5 /src/contest.c | |
| parent | 01e4381ab71c4ebf49fd66d88bfc2833ba1bffc5 (diff) | |
Match sub_806CF04
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/contest.c b/src/contest.c index 150c6dbbd..06fc71888 100644 --- a/src/contest.c +++ b/src/contest.c @@ -719,7 +719,7 @@ void debug_sub_80BA054(u8 taskId) gContestMons[gContestPlayerMonIndex].species, gContestMons[gContestPlayerMonIndex].otId, gContestMons[gContestPlayerMonIndex].personality); - gSprites[r6].pos2.x = 120; + gSprites[r6].x2 = 120; gSprites[r6].callback = SpriteCB_MonSlideIn; gTasks[taskId].data[2] = r6; gBattlerSpriteIds[gBattlerAttacker] = r6; @@ -932,7 +932,7 @@ void Task_DoAppeals(u8 taskId) gContestMons[sContest.currentContestant].species, gContestMons[sContest.currentContestant].otId, gContestMons[sContest.currentContestant].personality); - gSprites[spriteId].pos2.x = 120; + gSprites[spriteId].x2 = 120; gSprites[spriteId].callback = SpriteCB_MonSlideIn; gTasks[taskId].data[2] = spriteId; gBattlerSpriteIds[gBattlerAttacker] = spriteId; @@ -1594,9 +1594,9 @@ void Task_EndWaitForLink(u8 taskId) void SpriteCB_MonSlideIn(struct Sprite *sprite) { - if (sprite->pos2.x != 0) + if (sprite->x2 != 0) { - sprite->pos2.x -= 2; + sprite->x2 -= 2; } else { @@ -1610,8 +1610,8 @@ void SpriteCB_MonSlideIn(struct Sprite *sprite) void SpriteCB_MonSlideOut(struct Sprite *sprite) { - sprite->pos2.x -= 6; - if (sprite->pos1.x + sprite->pos2.x < -32) + sprite->x2 -= 6; + if (sprite->x + sprite->x2 < -32) { sprite->callback = SpriteCallbackDummy; sprite->invisible = TRUE; |