summaryrefslogtreecommitdiff
path: root/src/battle_util2.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-10-17 19:22:03 -0400
committerGriffinR <griffin.richards@comcast.net>2019-10-25 15:41:06 -0400
commit6db014cc32d28a64499af7d605be3a062560d5e0 (patch)
tree378d719659dd5a32b077bd6ee8140ccae6b2799c /src/battle_util2.c
parent60a592a2c32d07d47c892204659a8576017584d1 (diff)
Document party_menu first pass
Diffstat (limited to 'src/battle_util2.c')
-rw-r--r--src/battle_util2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c
index ce2153b2d..2c8e8c8f2 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -110,13 +110,13 @@ void sub_80571DC(u8 battlerId, u8 arg1)
// gBattleStruct->field_60[0][i]
- for (i = 0; i < 3; i++)
- gUnknown_0203CF00[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
+ for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+ gBattlePartyCurrentOrder[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60));
- sub_81B8FB0(pokemon_order_func(gBattlerPartyIndexes[battlerId]), pokemon_order_func(arg1));
+ SwitchPartyMonSlots(GetBattlerPartyId(gBattlerPartyIndexes[battlerId]), GetBattlerPartyId(arg1));
- for (i = 0; i < 3; i++)
- *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gUnknown_0203CF00[i];
+ for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++)
+ *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
}
}