ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 02:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix undefined behaviour in protect animation

Browse Source 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
This commit is contained in:
DizzyEggg 2020-07-27 12:27:35 +02:00 committed by PokeCodec
parent ad3de420af
commit 11178a49db
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle_anim_effects_1.c
View File

@ -3967,24 +3967,25 @@ static void AnimProtect(struct Sprite* sprite)
static void AnimProtect_Step(struct Sprite *sprite) static void AnimProtect_Step(struct Sprite *sprite)
{ {
int a; int i, savedPal;
int i;
sprite->data[5] += 96; sprite->data[5] += 96;
sprite->pos2.x = -(sprite->data[5] >> 8); sprite->pos2.x = -(sprite->data[5] >> 8);
if (++sprite->data[1] > 1) if (++sprite->data[1] > 1)
{ {
int id;
sprite->data[1] = 0; sprite->data[1] = 0;
a = gPlttBufferFaded[sprite->data[2] + 1]; savedPal = gPlttBufferFaded[sprite->data[2] + 1];
i = 0; i = 0;
do do
{ {
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]; id = sprite->data[2] + ++i;
gPlttBufferFaded[id] = gPlttBufferFaded[id + 1];
} while (i < 6); } while (i < 6);
gPlttBufferFaded[sprite->data[2] + 7] = a; gPlttBufferFaded[sprite->data[2] + 7] = savedPal;
} }
if (sprite->data[7] > 6 && sprite->data[0] >0 && ++sprite->data[6] > 1) if (sprite->data[7] > 6 && sprite->data[0] > 0 && ++sprite->data[6] > 1)
{ {
sprite->data[6] = 0; sprite->data[6] = 0;
sprite->data[7] -= 1; sprite->data[7] -= 1;