summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-14 10:41:27 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-14 10:46:04 -0400
commitb8fec3d9f617ec9a764bb56804c526ff7449631f (patch)
tree2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /src/battle_controller_player.c
parent9fe74ac590f75a0571de8ebcd499fdf892419328 (diff)
parent8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff)
Merge branch 'master' into trade
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 0d827c8db..a9bb5bc6e 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -1191,7 +1191,7 @@ static void sub_80303A8(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u8 battlerId = tExpTask_battler;
- u16 v5 = sub_80768B0(battlerId);
+ u16 v5 = GetBattlerSpriteBGPriorityRank(battlerId);
bool32 v6 = ((v5 ^ BIT_SIDE)) != B_SIDE_PLAYER;
struct Sprite *sprite = &gSprites[gBattlerSpriteIds[battlerId]];
@@ -1222,7 +1222,7 @@ static void sub_80303A8(u8 taskId)
u32 battlerIdAlt = battlerId;
bool32 v6Alt = v6;
- sub_8072E48(battlerIdAlt, v6Alt);
+ MoveBattlerSpriteToBG(battlerIdAlt, v6Alt);
}
++data[15];
break;