diff options
| author | garak <garakmon@gmail.com> | 2018-12-17 23:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 23:34:16 -0500 |
| commit | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch) | |
| tree | 003c2daccebd740c288e537216afed0265bfbc59 /src/battle/anim/cyclone.c | |
| parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/cyclone.c')
| -rw-r--r-- | src/battle/anim/cyclone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index 8a7f34d5d..b02f7b858 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D0118(struct Sprite* sprite); @@ -39,7 +39,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C = void sub_80D0118(struct Sprite* sprite) { InitAnimSpritePos(sprite, 0); - if (GetBattlerSide(gAnimBankAttacker) == 0) + if (GetBattlerSide(gBattleAnimAttacker) == 0) sprite->pos1.y += 16; sprite->data[0] = gBattleAnimArgs[4]; |