summaryrefslogtreecommitdiff
path: root/src/rock.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-12-18 19:31:04 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-12-18 19:54:27 -0600
commit2592803460fcaeb2dd804080eb8770c85613773e (patch)
treeba53079591d9629dcf4672b544f13651f346d425 /src/rock.c
parentcd994f4935b9de81383d8e0a17d790414652a4d6 (diff)
parentb2ac3b6d6f06ed4a2d64af90e97796c66bcdeb5f (diff)
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'src/rock.c')
-rw-r--r--src/rock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rock.c b/src/rock.c
index 3b8e505d8..20d4ea738 100644
--- a/src/rock.c
+++ b/src/rock.c
@@ -340,7 +340,7 @@ static void sub_8110A70(struct Sprite *sprite)
sprite->data[3] = 32;
sprite->data[4] = -24;
- StoreSpriteCallbackInData6(sprite, move_anim_8074EE0);
+ StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A6450;
sprite->callback(sprite);
}
@@ -367,8 +367,8 @@ void sub_8110AB4(struct Sprite *sprite)
sprite->data[3] = 0;
sprite->data[4] = 0;
- sprite->callback = sub_80A656C;
- StoreSpriteCallbackInData6(sprite, move_anim_8074EE0);
+ sprite->callback = TranslateAnimLinearSimple;
+ StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
}
void sub_8110B38(struct Sprite *sprite)