From 0a16dd0df08213b58a804b0711a7fdeb79377ce6 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 7 Apr 2019 14:19:02 -0700 Subject: Decompile/port rest of battle_anim plus fix 1 NONMATCHING. --- src/battle/anim/shock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle/anim/shock.c') diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 4459e43b8..c6dfd09cc 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -85,7 +85,7 @@ void sub_80D6294(struct Sprite *sprite) sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; - StoreSpriteCallbackInData(sprite, move_anim_8074EE0); + StoreSpriteCallbackInData(sprite, DestroySpriteAndMatrix); sprite->callback = sub_8078114; } @@ -142,7 +142,7 @@ void sub_80D6328(struct Sprite *sprite) if (gBattleAnimArgs[6] & 1) { - sprite->oam.priority = sub_8079ED4(slot) + 1; + sprite->oam.priority = GetBattlerSpriteBGPriority(slot) + 1; } matrixNum = sprite->oam.matrixNum; -- cgit v1.2.3