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/fire.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/fire.c')
| -rw-r--r-- | src/battle/anim/fire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index c5d75d9a5..59923ea1a 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -4,7 +4,7 @@ #include "trig.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; +extern u8 gBattleAnimAttacker; void sub_80D4ED8(struct Sprite *sprite); void sub_80D4F18(struct Sprite *sprite); @@ -202,7 +202,7 @@ void sub_80D4F5C(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -224,7 +224,7 @@ void sub_80D4F5C(struct Sprite *sprite) void sub_80D4FCC(struct Sprite *sprite) { - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -260,7 +260,7 @@ void sub_80D5074(struct Sprite *sprite) { sub_8078650(sprite); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { sprite->pos1.x -= gBattleAnimArgs[0]; } |