diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-10-25 21:55:01 -0400 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-10-31 03:25:56 -0400 |
commit | e01ec84837c018bd3bfde58d7987d32733cc8bd6 (patch) | |
tree | d77ea1ff907db132b393b02e089a365d00907ebe /src/battle_main.c | |
parent | 6db014cc32d28a64499af7d605be3a062560d5e0 (diff) |
Document party_menu second pass
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 863fabef8..7ae8d5c46 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4122,20 +4122,20 @@ u8 IsRunningFromBattleImpossible(void) return 0; } -void sub_803BDA0(u8 battler) +void SwitchPartyOrder(u8 battler) { s32 i; - u8 r4; - u8 r1; + u8 partyId1; + u8 partyId2; // gBattleStruct->field_60[battler][i] for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++) gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8*)(gBattleStruct->field_60)); - r4 = GetBattlerPartyId(gBattlerPartyIndexes[battler]); - r1 = GetBattlerPartyId(*(gBattleStruct->monToSwitchIntoId + battler)); - SwitchPartyMonSlots(r4, r1); + partyId1 = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battler]); + partyId2 = GetPartyIdFromBattlePartyId(*(gBattleStruct->monToSwitchIntoId + battler)); + SwitchPartyMonSlots(partyId1, partyId2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { @@ -4590,7 +4590,7 @@ static void HandleTurnActionSelectionState(void) for (i = 0; i < gBattlersCount; i++) { if (gChosenActionByBattler[i] == B_ACTION_SWITCH) - sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i)); + SwitchPartyOrderInGameMulti(i, *(gBattleStruct->monToSwitchIntoId + i)); } } } |