From 306ce048ad07d62bed2028bfc8f30c03f5bc8db7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Sep 2019 21:07:54 -0400 Subject: Move gflib srcs and headers to gflib subdir --- src/battle_util2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_util2.c') diff --git a/src/battle_util2.c b/src/battle_util2.c index f840cd58b..ce2153b2d 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -2,7 +2,7 @@ #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" -#include "alloc.h" +#include "malloc.h" #include "pokemon.h" #include "trainer_hill.h" #include "party_menu.h" -- cgit v1.2.3 From 6db014cc32d28a64499af7d605be3a062560d5e0 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 17 Oct 2019 19:22:03 -0400 Subject: Document party_menu first pass --- src/battle_util2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/battle_util2.c') 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]; } } -- cgit v1.2.3 From e01ec84837c018bd3bfde58d7987d32733cc8bd6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 25 Oct 2019 21:55:01 -0400 Subject: Document party_menu second pass --- src/battle_util2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_util2.c') diff --git a/src/battle_util2.c b/src/battle_util2.c index 2c8e8c8f2..fd0dda76b 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -102,7 +102,7 @@ void AdjustFriendshipOnBattleFaint(u8 battlerId) } } -void sub_80571DC(u8 battlerId, u8 arg1) +void SwitchPartyOrderInGameMulti(u8 battlerId, u8 arg1) { if (GetBattlerSide(battlerId) != B_SIDE_OPPONENT) { @@ -113,7 +113,7 @@ void sub_80571DC(u8 battlerId, u8 arg1) for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++) gBattlePartyCurrentOrder[i] = *(0 * 3 + i + (u8*)(gBattleStruct->field_60)); - SwitchPartyMonSlots(GetBattlerPartyId(gBattlerPartyIndexes[battlerId]), GetBattlerPartyId(arg1)); + SwitchPartyMonSlots(GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battlerId]), GetPartyIdFromBattlePartyId(arg1)); for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++) *(0 * 3 + i + (u8*)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i]; -- cgit v1.2.3