summaryrefslogtreecommitdiff
path: root/src/battle/battle_7.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-09 02:39:57 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-09 02:39:57 +0100
commitc17a46823e55c5b60592963d7edb9425255aea8d (patch)
tree158b2ee43ebbac1150ea36203310752813c3a6ad /src/battle/battle_7.c
parent353a083d97be81cbc612ecb8de46b62a0e523362 (diff)
parentc4c885504729b56c00aa245aea6e284a1b6a1719 (diff)
Merge branch 'master' into some_battle_sound_stuff
Diffstat (limited to 'src/battle/battle_7.c')
-rw-r--r--src/battle/battle_7.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index e11971606..1c79d7ebf 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -795,7 +795,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b)
void BattleMusicStop(void)
{
- u8 r4 = GetBankByPlayerAI(0);
+ u8 r4 = GetBankByIdentity(0);
ewram17800[r4].unk0_1 = 0;
if (IsDoubleBattle())
@@ -815,8 +815,8 @@ void sub_8032638(void)
{
if (gMain.inBattle)
{
- u8 r8 = GetBankByPlayerAI(0);
- u8 r9 = GetBankByPlayerAI(2);
+ u8 r8 = GetBankByIdentity(0);
+ u8 r9 = GetBankByIdentity(2);
u8 r4 = pokemon_order_func(gBattlePartyID[r8]);
u8 r5 = pokemon_order_func(gBattlePartyID[r9]);
@@ -857,12 +857,12 @@ void sub_80327CC(void)
u8 r5;
LoadCompressedObjectPic(&gUnknown_081FAF24);
- r5 = GetBankByPlayerAI(1);
+ r5 = GetBankByIdentity(1);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
gSprites[ewram17810[r5].unk7].data[0] = r5;
if (IsDoubleBattle())
{
- r5 = GetBankByPlayerAI(3);
+ r5 = GetBankByIdentity(3);
ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8);
gSprites[ewram17810[r5].unk7].data[0] = r5;
}