Merge remote-tracking branch 'upstream/master' into berry_crush

1 files changed, 2 insertions, 4 deletions

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index e63a2cef1..bfcf77b5c 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -8,7 +8,6 @@
 #include "util.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
-#include "constants/species.h"
 
 struct UnkAnimStruct
 {
@@ -2884,10 +2883,9 @@ static void sub_8181C2C(struct Sprite *sprite)
     }
     else
     {
+        s32 var = sUnknown_03001240[sprite->data[0]].field_8;
 
-        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 * ((counter % 128) * 8) / 128 + 8 * -var;
         sprite->pos2.y = -(Sin(counter % 128, 8));
     }