Skip to content

Commit 5a3fc2a

Browse files
Merge pull request #2154 from DizzyEggg/patch-1
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
2 parents ec6e85d + 1cc4321 commit 5a3fc2a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/battle_anim_effects_1.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3082,20 +3082,18 @@ static void AnimPresent(struct Sprite *sprite)
30823082

30833083
static void AnimKnockOffOpponentsItem(struct Sprite *sprite)
30843084
{
3085-
int zero;
30863085
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
3087-
zero = 0;
30883086
if (sprite->data[0] > 0x7F)
30893087
{
30903088
sprite->data[1]++;
3091-
sprite->data[0] = zero;
3089+
sprite->data[0] = 0;
30923090
}
30933091

30943092
sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
30953093
if (moveAlongLinearPath(sprite))
30963094
{
3097-
sprite->y2 = zero;
3098-
sprite->data[0] = zero;
3095+
sprite->y2 = 0;
3096+
sprite->data[0] = 0;
30993097
DestroyAnimSprite(sprite);
31003098
}
31013099
}
@@ -3173,13 +3171,11 @@ static void AnimItemSteal(struct Sprite *sprite)
31733171

31743172
static void AnimItemSteal_Step3(struct Sprite *sprite)
31753173
{
3176-
int zero;
31773174
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
3178-
zero = 0;
31793175
if (sprite->data[0] > 127)
31803176
{
31813177
sprite->data[1]++;
3182-
sprite->data[0] = zero;
3178+
sprite->data[0] = 0;
31833179
}
31843180

31853181
sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);

0 commit comments

Comments
 (0)