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/sfx.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/sfx.c')
| -rw-r--r-- | src/battle/anim/sfx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index e41251964..e1127508b 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -7,8 +7,8 @@ #include "task.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattlerPartyIndexes[]; extern u16 gAnimSpeciesByBanks[]; extern u8 gUnknown_0202F7D2; @@ -158,13 +158,13 @@ void sub_812B18C(u8 taskId) { u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else if (gBattleAnimArgs[0] == 1) - bank = gAnimBankTarget; + bank = gBattleAnimTarget; else if (gBattleAnimArgs[0] == 2) - bank = gAnimBankAttacker ^ 0x2; + bank = gBattleAnimAttacker ^ 0x2; else - bank = gAnimBankTarget ^ 0x2; + bank = gBattleAnimTarget ^ 0x2; if (gBattleAnimArgs[0] == 1 || gBattleAnimArgs[0] == 3) { @@ -202,7 +202,7 @@ void sub_812B2B8(u8 taskId) if (IsContest()) species = shared19348.unk0; else - species = gAnimSpeciesByBanks[gAnimBankAttacker]; + species = gAnimSpeciesByBanks[gBattleAnimAttacker]; if (species != 0) PlayCry3(species, pan, 4); |