diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-24 03:03:29 +0800 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 14:54:50 -0700 |
| commit | 1ffe7f78cb75b5e5f63bd803ad3fd47126a2e7c6 (patch) | |
| tree | fb6ce6625c8df2b5ae4fadf5b5c67fd6f67864f5 /src/battle_main.c | |
| parent | 98be2d1805920105f31baf633453ce39e968e018 (diff) | |
party_menu fourth quarter
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index a6d7e69c8..d307d4f55 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3005,8 +3005,8 @@ void sub_8013F6C(u8 battler) for (i = 0; i < 3; ++i) gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)); - r4 = pokemon_order_func(gBattlerPartyIndexes[battler]); - r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler)); + r4 = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battler]); + r1 = GetPartyIdFromBattlePartyId(*(gBattleStruct->monToSwitchIntoId + battler)); SwitchPartyMonSlots(r4, r1); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { |