diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-09 11:12:12 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-09 11:12:12 -0400 |
| commit | 3af118b0a7ce1a49d0403bbe30ac2496e1c52c0b (patch) | |
| tree | b01d438a9d6b760815b8722e25c4a2721714b81b /src | |
| parent | 779764b70dd113df4090dc09949e5a6b0dd71db0 (diff) | |
Fix fakematch in pokemon animation
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_animation.c | 9 |
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)); } |