Merge pull request #452 from Kurausukun/protectfix

Port Protect Animation Fix from Emerald
This commit is contained in:
GriffinR
2021-07-13 00:42:44 -04:00
committed by GitHub
+7 -8
View File
@@ -3945,22 +3945,21 @@ void AnimProtect(struct Sprite* sprite)
static void AnimProtectStep(struct Sprite *sprite)
{
int a;
int i;
int i, id, savedPal;
sprite->data[5] += 96;
sprite->pos2.x = -(sprite->data[5] >> 8);
if (++sprite->data[1] > 1)
{
sprite->data[1] = 0;
a = gPlttBufferFaded[sprite->data[2] + 1];
savedPal = gPlttBufferFaded[sprite->data[2] + 1];
i = 0;
do
while (i < 6)
{
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1];
} while (i < 6);
id = sprite->data[2] + ++i;
gPlttBufferFaded[id] = gPlttBufferFaded[id + 1];
}
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)