summaryrefslogtreecommitdiff
path: root/src/pokemon_animation.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokemon_animation.c')
-rw-r--r--src/pokemon_animation.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index e63a2cef1..37abb90e9 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -2884,10 +2884,13 @@ static void sub_8181C2C(struct Sprite *sprite)
}
else
{
+ #ifndef NONMATCHING
+ register s32 var asm("r4") = sUnknown_03001240[sprite->data[0]].field_8;
+ #else
+ s32 var = sUnknown_03001240[sprite->data[0]].field_8;
+ #endif
- const s16 var = sUnknown_03001240[sprite->data[0]].field_8;
-
- sprite->pos2.x = var * ((counter % 128) * 8) / 128 + 8 * -var; //Should be - 8 * var instead of + 8 * -var, but that doesn't match
+ sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (sUnknown_03001240[sprite->data[0]].field_8 * 8);
sprite->pos2.y = -(Sin(counter % 128, 8));
}