summaryrefslogtreecommitdiff
path: root/src/battle_controllers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_controllers.c')
-rw-r--r--src/battle_controllers.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 29540f3a9..d0e76ab1b 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -95,7 +95,7 @@ void sub_8032768(void)
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{
for (i = 0; i < gBattlersCount; i++)
- sub_81B8D64(i, 0);
+ BufferBattlePartyCurrentOrderBySide(i, 0);
}
for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
@@ -144,10 +144,10 @@ static void InitSinglePlayerBtlControllers(void)
gBattlersCount = MAX_BATTLERS_COUNT;
- sub_81B8D64(0, 0);
- sub_81B8D64(1, 0);
- sub_81B8D64(2, 1);
- sub_81B8D64(3, 1);
+ BufferBattlePartyCurrentOrderBySide(0, 0);
+ BufferBattlePartyCurrentOrderBySide(1, 0);
+ BufferBattlePartyCurrentOrderBySide(2, 1);
+ BufferBattlePartyCurrentOrderBySide(3, 1);
gBattlerPartyIndexes[0] = 0;
gBattlerPartyIndexes[1] = 0;
@@ -247,10 +247,10 @@ static void InitSinglePlayerBtlControllers(void)
gBattlersCount = MAX_BATTLERS_COUNT;
- sub_81B8D64(0, 0);
- sub_81B8D64(1, 0);
- sub_81B8D64(2, 1);
- sub_81B8D64(3, 1);
+ BufferBattlePartyCurrentOrderBySide(0, 0);
+ BufferBattlePartyCurrentOrderBySide(1, 0);
+ BufferBattlePartyCurrentOrderBySide(2, 1);
+ BufferBattlePartyCurrentOrderBySide(3, 1);
gBattlerPartyIndexes[0] = 0;
gBattlerPartyIndexes[1] = 0;
@@ -267,11 +267,11 @@ static void InitSinglePlayerBtlControllers(void)
{
case 0:
case 3:
- sub_81B8D64(gLinkPlayers[i].id, 0);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
- sub_81B8D64(gLinkPlayers[i].id, 1);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
break;
}
@@ -487,10 +487,10 @@ static void InitLinkBtlControllers(void)
gBattlersCount = MAX_BATTLERS_COUNT;
}
- sub_81B8D64(0, 0);
- sub_81B8D64(1, 0);
- sub_81B8D64(2, 1);
- sub_81B8D64(3, 1);
+ BufferBattlePartyCurrentOrderBySide(0, 0);
+ BufferBattlePartyCurrentOrderBySide(1, 0);
+ BufferBattlePartyCurrentOrderBySide(2, 1);
+ BufferBattlePartyCurrentOrderBySide(3, 1);
gBattlerPartyIndexes[0] = 0;
gBattlerPartyIndexes[1] = 0;
gBattlerPartyIndexes[2] = 3;
@@ -509,11 +509,11 @@ static void InitLinkBtlControllers(void)
{
case 0:
case 3:
- sub_81B8D64(gLinkPlayers[i].id, 0);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
- sub_81B8D64(gLinkPlayers[i].id, 1);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
break;
}