summaryrefslogtreecommitdiff
path: root/src/battle_controllers.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-25 09:15:34 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-11-25 09:15:34 -0500
commit10aa908f56599c155ecf70ccee6b07eea07fb643 (patch)
tree0bec37a7083498f43dcf1124ceb0ce13c74ca420 /src/battle_controllers.c
parent0e3d574276db954994b0be24c61813b0b0e28c0c (diff)
parent46773995020da0bc7984933f7f407ff30394596d (diff)
Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data
Diffstat (limited to 'src/battle_controllers.c')
-rw-r--r--src/battle_controllers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 6fb090307..ca2ef0b22 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -75,7 +75,7 @@ void sub_800D30C(void)
SetBattlePartyIds();
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
for (i = 0; i < gBattlersCount; ++i)
- sub_8127DA8(i, 0);
+ BufferBattlePartyCurrentOrderBySide(i, 0);
}
static void InitSinglePlayerBtlControllers(void)
@@ -199,11 +199,11 @@ static void InitLinkBtlControllers(void)
{
case 0:
case 3:
- sub_8127DA8(gLinkPlayers[i].id, 0);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
- sub_8127DA8(gLinkPlayers[i].id, 1);
+ BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
break;
}
if (i == multiplayerId)