summaryrefslogtreecommitdiff
path: root/src/pokemon_special_anim_scene.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-18 09:09:25 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-18 09:09:25 -0400
commitd8f858d04e1204d3a1997b0e22b02d460b098874 (patch)
tree145189a2e8e563318172ea72707b6391114fa0b4 /src/pokemon_special_anim_scene.c
parent2455913e392c79a311f361ca755762aa736fd04f (diff)
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/pokemon_special_anim_scene.c')
-rw-r--r--src/pokemon_special_anim_scene.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c
index b2e04e7e0..6c9f21099 100644
--- a/src/pokemon_special_anim_scene.c
+++ b/src/pokemon_special_anim_scene.c
@@ -1040,7 +1040,11 @@ static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, stru
{
u16 species;
u32 personality;
- register int x asm("r4"); // FIXME
+ #ifndef NONMATCHING
+ register int x asm("r4"); // FIXME
+ #else
+ int x;
+ #endif
u8 y;
if (closeness == 3)
{
@@ -1252,7 +1256,11 @@ static void Task_UseItem_OutwardSpiralDots(u8 taskId)
s16 *data = gTasks[taskId].data;
struct Sprite * sprite;
int x;
- register int y asm("r10"); // FIXME
+ #ifndef NONMATCHING
+ register int y asm("r10"); // FIXME
+ #else
+ int y;
+ #endif
int x2;
int y2;
int ampl;