diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-24 03:03:29 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-24 03:03:29 +0800 |
| commit | 972c044d71a870128d2ac41b5b407a1db41d60de (patch) | |
| tree | 597c13c139566d6923bd5ee9b83a9c8dc357664a /src/battle_main.c | |
| parent | 5c1bdd0eb54b4159e4d66d9f733b0f66697a2436 (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) { |