summaryrefslogtreecommitdiff
path: root/src/pokemon_animation.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-18 08:11:25 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-18 08:16:09 -0400
commit0e7f634b00f904ac29088f3b7fdac0c51999be2d (patch)
tree57451f084310621d1169f6da3cedff4ae32a5dc1 /src/pokemon_animation.c
parent3372993a6361e9417f016046caa8629254b84ba6 (diff)
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/pokemon_animation.c')
-rw-r--r--src/pokemon_animation.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index a388be39a..37abb90e9 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -2884,7 +2884,11 @@ static void sub_8181C2C(struct Sprite *sprite)
}
else
{
- register s32 var asm("r4") = sUnknown_03001240[sprite->data[0]].field_8;
+ #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);
sprite->pos2.y = -(Sin(counter % 128, 8));