summaryrefslogtreecommitdiff
path: root/src/battle/anim/tile_out.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-04 22:21:39 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-04 22:21:39 -0500
commit5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (patch)
treee1357a59a3d98cf1e976f948f98d799f87a00bf3 /src/battle/anim/tile_out.c
parentab06b56532026db85a9cba1c21c8b2235fcdf222 (diff)
parentf0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff)
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'src/battle/anim/tile_out.c')
-rwxr-xr-xsrc/battle/anim/tile_out.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c
index 8b710268f..50468a440 100755
--- a/src/battle/anim/tile_out.c
+++ b/src/battle/anim/tile_out.c
@@ -6,8 +6,8 @@
#include "battle_interface.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern u8 gNoOfAllBanks;
extern u8 gHealthboxIDs[];
@@ -35,10 +35,10 @@ void sub_80CE1AC(struct Sprite* sprite)
{
sprite->animPaused = 0;
sprite->data[0] = 30;
- sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2);
- sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3);
+ sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2);
+ sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3);
sprite->callback = sub_8078B34;
- StoreSpriteCallbackInData(sprite, move_anim_8072740);
+ StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
}
}