summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2021-03-22 23:56:38 -0400
committerKurausukun <lord.uber1@gmail.com>2021-03-22 23:56:38 -0400
commit646c44322180b133097b593503f576719a9fffda (patch)
tree51e6ee7ce488184235cba343b80925396883ab07 /src
parent3f236d09c6d68a98bee5401eb5ffea7b2cddfefb (diff)
[LEAK-INFORMED] fix Task_UseItem_OutwardSpiralDots fakematching
Diffstat (limited to 'src')
-rw-r--r--src/pokemon_special_anim_scene.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c
index ec056a2b0..e7201ef52 100644
--- a/src/pokemon_special_anim_scene.c
+++ b/src/pokemon_special_anim_scene.c
@@ -1259,23 +1259,14 @@ static void StopMakingOutwardSpiralDots(void)
static void Task_UseItem_OutwardSpiralDots(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- struct Sprite * sprite;
- int x;
- #ifndef NONMATCHING
- register int y asm("r10"); // FIXME
- #else
- int y;
- #endif
- int x2;
- int y2;
- int ampl;
- u8 spriteId;
+
switch (tState)
{
case 0:
if (tTimer == 0)
{
- sprite = PSA_GetSceneWork()->itemIconSprite;
+ u32 spriteId, x, y, x2, y2, ampl;
+ struct Sprite * sprite = PSA_GetSceneWork()->itemIconSprite;
x = sprite->pos1.x + sprite->pos2.x;
y = sprite->pos1.y + sprite->pos2.y;
ampl = (PSAScene_RandomFromTask(taskId) % 21) + 70;