diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
| commit | c17a46823e55c5b60592963d7edb9425255aea8d (patch) | |
| tree | 158b2ee43ebbac1150ea36203310752813c3a6ad /src/battle/battle_party_menu.c | |
| parent | 353a083d97be81cbc612ecb8de46b62a0e523362 (diff) | |
| parent | c4c885504729b56c00aa245aea6e284a1b6a1719 (diff) | |
Merge branch 'master' into some_battle_sound_stuff
Diffstat (limited to 'src/battle/battle_party_menu.c')
| -rw-r--r-- | src/battle/battle_party_menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index d4dcae0ca..7bce00d82 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -122,7 +122,7 @@ static void sub_8094998(u8 arg[3], u8 player_number) if (!IsDoubleBattle()) { pos = 1; - *temp = gBattlePartyID[GetBankByPlayerAI(0)]; + *temp = gBattlePartyID[GetBankByIdentity(0)]; for (i = 0; i <= 5; i++) if (i != *temp) temp[pos++] = i; @@ -130,8 +130,8 @@ static void sub_8094998(u8 arg[3], u8 player_number) else { pos = 2; - *temp = gBattlePartyID[GetBankByPlayerAI(0)]; - temp[1] = gBattlePartyID[GetBankByPlayerAI(2)]; + *temp = gBattlePartyID[GetBankByIdentity(0)]; + temp[1] = gBattlePartyID[GetBankByIdentity(2)]; for (i = 0; i <= 5; i++) if ((i != *temp) && (i != temp[1])) temp[pos++] = i; @@ -147,13 +147,13 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) u8 temp[6]; if (!GetBankSide(arg3)) { - i = GetBankByPlayerAI(0); - j = GetBankByPlayerAI(2); + i = GetBankByIdentity(0); + j = GetBankByIdentity(2); } else { - i = GetBankByPlayerAI(1); - j = GetBankByPlayerAI(3); + i = GetBankByIdentity(1); + j = GetBankByIdentity(3); } if (IsLinkDoubleBattle() == TRUE) { |