summaryrefslogtreecommitdiff
path: root/src/battle/anim/sfx.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-25 17:50:27 -0500
commit605f8ac1141daf66d3428923e004f82f5a5e1594 (patch)
treea3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/battle/anim/sfx.c
parente88e39d5fda1644f77e41fd652d4310612da7532 (diff)
parent659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff)
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/battle/anim/sfx.c')
-rw-r--r--src/battle/anim/sfx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 10ef1681e..6d47f0b46 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -9,7 +9,7 @@
extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
-extern u16 gBattlePartyID[];
+extern u16 gBattlerPartyIndexes[];
extern u16 gAnimSpeciesByBanks[];
extern u8 gUnknown_0202F7D2;
@@ -175,10 +175,10 @@ void sub_812B18C(u8 taskId)
}
}
- if (GetBankSide(bank))
- species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], 0xB);
+ if (GetBattlerSide(bank))
+ species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[bank]], 0xB);
else
- species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], 0xB);
+ species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[bank]], 0xB);
}
if (species != 0)