summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2020-10-26 00:06:19 -0400
committerKurausukun <lord.uber1@gmail.com>2020-10-26 00:06:19 -0400
commit9d067dfe0d4fff1e638bc8a8739e833be44726ea (patch)
tree24a889c60eddb56a6a458efaa068385b1ec5ac91 /src
parent83846b913ac7dd23389588a23b3bb1aa2062a2ee (diff)
port sub_8181C2C fakematching fix
Diffstat (limited to 'src')
-rw-r--r--src/pokemon_animation.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 37abb90e9..916a57907 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -2884,13 +2884,9 @@ 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
+ s32 var = sUnknown_03001240[sprite->data[0]].field_8;
- sprite->pos2.x = (var << 3) * (counter % 128) / 128 - (sUnknown_03001240[sprite->data[0]].field_8 * 8);
+ sprite->pos2.x = var * ((counter % 128) * 8) / 128 + 8 * -var;
sprite->pos2.y = -(Sin(counter % 128, 8));
}