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/fire.c | |
| parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
Merge branch 'master' into createsprite
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 6262b382d..09e83813b 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]; } |