diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-12-17 22:22:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-17 22:22:27 -0600 |
commit | 747a3b4b3e76db3a8f94bafcbe8d38e740850d59 (patch) | |
tree | 2e9f0cad82e7b8d8968db0d7fa750636eee470ed /src/battle/anim/osmose.c | |
parent | fa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff) | |
parent | 00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff) |
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
Diffstat (limited to 'src/battle/anim/osmose.c')
-rw-r--r-- | src/battle/anim/osmose.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index 36949b3c5..26350cbbe 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CB768(struct Sprite* sprite); @@ -39,8 +39,8 @@ void sub_80CB768(struct Sprite* sprite) { if (!sprite->data[0]) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1]; sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[3] = gBattleAnimArgs[4]; |