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/hop_2.c | |
| parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/hop_2.c')
| -rw-r--r-- | src/battle/anim/hop_2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 5ebefd626..83d67c94a 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern void sub_80CB7EC(struct Sprite* sprite, s16 c); extern bool8 sub_80CB814(struct Sprite* sprite); @@ -36,9 +36,9 @@ void sub_80CBAE8(struct Sprite* sprite) s16 p1; s16 p2; sub_8078764(sprite, FALSE); - p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1); - if ((gAnimBankTarget ^ 2) == gAnimBankAttacker) + p1 = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + p2 = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); + if ((gBattleAnimTarget ^ 2) == gBattleAnimAttacker) { sprite->data[6] = p1; sprite->data[7] = p2 + 10; |