diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-21 12:44:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:44:07 -0400 |
| commit | cd895e497d68bf9adbaa067dc411cc99a3bd1a4b (patch) | |
| tree | ad8bed728bb939cf08fbb8b9fd7d4c009a06459e /src/pokemon_animation.c | |
| parent | 6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff) | |
| parent | 0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff) | |
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/pokemon_animation.c')
| -rw-r--r-- | src/pokemon_animation.c | 6 |
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)); |