dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2154 from DizzyEggg/patch-1

Browse Source 
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
This commit is contained in:
GriffinR
2025-06-13 11:28:26 -04:00
committed by GitHub
parent ec6e85d4b4 1cc4321a42
commit 5a3fc2a61b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_anim_effects_1.c
View File

@@ -3082,20 +3082,18 @@ static void AnimPresent(struct Sprite *sprite)
static void AnimKnockOffOpponentsItem(struct Sprite *sprite) static void AnimKnockOffOpponentsItem(struct Sprite *sprite)
{ {
int zero;
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
zero = 0;
if (sprite->data[0] > 0x7F) if (sprite->data[0] > 0x7F)
{ {
sprite->data[1]++; sprite->data[1]++;
sprite->data[0] = zero; sprite->data[0] = 0;
} }
sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
if (moveAlongLinearPath(sprite)) if (moveAlongLinearPath(sprite))
{ {
sprite->y2 = zero; sprite->y2 = 0;
sprite->data[0] = zero; sprite->data[0] = 0;
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
} }
} }
@@ -3173,13 +3171,11 @@ static void AnimItemSteal(struct Sprite *sprite)
static void AnimItemSteal_Step3(struct Sprite *sprite) static void AnimItemSteal_Step3(struct Sprite *sprite)
{ {
int zero;
sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]);
zero = 0;
if (sprite->data[0] > 127) if (sprite->data[0] > 127)
{ {
sprite->data[1]++; sprite->data[1]++;
sprite->data[0] = zero; sprite->data[0] = 0;
} }
sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);