summaryrefslogtreecommitdiff
path: root/src/rock.c
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-18 05:31:39 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-18 05:31:39 -0500
commitc259ee46d3e0b0fc7e9a43e6448ef74247fedbf0 (patch)
tree7a4e53444248dd49aacbbf23a3af9f91cca8ef24 /src/rock.c
parent076d07f6fe24691d6d9d8872c049b18e2e16fa57 (diff)
parentc74468fd11b551e1babf18a4d320e114fe495bd8 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
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)