diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-05 18:53:19 -0500 |
| commit | f6527d12428c8a8bd2561c3da50ebb36968e061c (patch) | |
| tree | 1882d862a18e61ddddf94dee1f9b4dae43336538 /src/battle/anim/flash.c | |
| parent | cbd3aa95d12bab05042025bd143a2a7cacf0b86d (diff) | |
| parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'src/battle/anim/flash.c')
| -rwxr-xr-x | src/battle/anim/flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index 0e087ec2d..eaa38e5b7 100755 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8; extern struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8; |