Merge pull request #1182 from PokeCodec/PokemonLogicFix

Fix more fakematches

1 files changed, 3 insertions, 6 deletions

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 37abb90e9..e63a2cef1 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -2884,13 +2884,10 @@ 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
 
-        sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (sUnknown_03001240[sprite->data[0]].field_8 * 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.y = -(Sin(counter % 128, 8));
     }