summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-12-05 10:28:32 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-12-05 10:28:32 -0500
commit63e079726f90e81067a05c4d2f33c82114e894df (patch)
tree6e7b856b2433caa42a61f0dfe4013b965b6d318b /src
parent752fdc7c420a0b67ef830df5c92335dfcd610402 (diff)
Fix modern superpower animation bug
Diffstat (limited to 'src')
-rw-r--r--src/battle/anim/normal.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index c3100a15d..9053d7844 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -746,7 +746,11 @@ static void sub_80E24B8(struct Sprite *sprite)
break;
}
+ #if MODERN
+ sprite->data[4] = *(u16 *)(sprite->data[6] | (sprite->data[7] << 16));
+ #else
sprite->data[4] = *(u32 *)(sprite->data[6] | (sprite->data[7] << 16));
+ #endif
sprite->data[5] = gBattleAnimArgs[3];
var0 = sprite->data[5] - 2;
if (var0 < 2)
@@ -770,13 +774,21 @@ static void sub_80E255C(struct Sprite *sprite)
else
{
sprite->data[1] = sprite->data[2];
+ #if MODERN
+ *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0];
+ #else
*(u32 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0];
+ #endif
sprite->data[0] = -sprite->data[0];
}
}
else
{
+ #if MODERN
+ *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4];
+ #else
*(u32 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4];
+ #endif
var0 = sprite->data[5] - 2;
if (var0 < 2)
{