diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-07 22:16:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 22:16:52 -0600 |
| commit | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (patch) | |
| tree | 4aafddc91df76b5674c47a2be3bb1b3a42a0b519 /src/battle/battle_7.c | |
| parent | 17d5ba39acb897e07e6842cbff5b1172cc6f7951 (diff) | |
| parent | be36c506387648a11afe51b0f4209386947feb37 (diff) | |
Merge pull request #515 from huderlem/battle_2
Decompile battle_2 and battle_util
Diffstat (limited to 'src/battle/battle_7.c')
| -rw-r--r-- | src/battle/battle_7.c | 10 |
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; } |