diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
| commit | 79c64d2b7137f12cccf290ea7f495727ad6b4cca (patch) | |
| tree | b2022ddfbc867bab3802465afbbdc7c3843460a9 /src/battle/anim | |
| parent | fd42bcc78ce229d13afc26af4c6d2dd0187b871d (diff) | |
| parent | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/battle/anim')
| -rw-r--r-- | src/battle/anim/fire_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 6dc304232..4d577a765 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -23,8 +23,8 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3); void sub_80D51A8(struct Sprite *sprite) { if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget) - && (gAnimBankAttacker == GetBankByPlayerAI(2) - || gAnimBankAttacker == GetBankByPlayerAI(3))) + && (gAnimBankAttacker == GetBankByIdentity(2) + || gAnimBankAttacker == GetBankByIdentity(3))) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->callback = sub_8079534; |