summaryrefslogtreecommitdiff
path: root/src/battle/anim/note_wave.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
commit16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
treeb92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/note_wave.c
parent86a36767dba19e84297047addf1d1d776e2efdec (diff)
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/note_wave.c')
-rwxr-xr-xsrc/battle/anim/note_wave.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c
index 4dc3ceb75..80ed2256f 100755
--- a/src/battle/anim/note_wave.c
+++ b/src/battle/anim/note_wave.c
@@ -6,8 +6,8 @@
#include "palette.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
extern u16 gUnknown_083D712C[4][6];
@@ -74,15 +74,15 @@ void sub_80CEB0C(struct Sprite* sprite)
sprite->data[1] = gBattleAnimArgs[1];
sprite->data[2] = 0;
sprite->data[3] = gBattleAnimArgs[2];
- if (NotInBattle())
+ if (IsContest())
{
a = 0x30;
b = 0x28;
}
else
{
- a = sub_8077ABC(gBattleAnimBankTarget, 2);
- b = sub_8077ABC(gBattleAnimBankTarget, 3);
+ a = GetBankPosition(gAnimBankTarget, 2);
+ b = GetBankPosition(gAnimBankTarget, 3);
}
sprite->data[4] = sprite->pos1.x << 4;