summaryrefslogtreecommitdiff
path: root/src/battle_controller_player_partner.c
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2019-01-05 19:54:26 +0000
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2019-01-05 19:54:26 +0000
commitf8c2fcb9b22a1b9cf43e293fdcb6df2b9d0dd164 (patch)
tree81b80d287c4fb3320a8143b9cfbb06e9fc4b34d5 /src/battle_controller_player_partner.c
parentee5a239534d7c4bd64ce7ced4146204579f5d598 (diff)
parentcbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base
Diffstat (limited to 'src/battle_controller_player_partner.c')
-rw-r--r--src/battle_controller_player_partner.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index ddb241b30..3cfc94977 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1308,13 +1308,13 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
{
trainerPicId = TRAINER_BACK_PIC_STEVEN;
xPos = 90;
- yPos = (8 - gTrainerBackPicCoords[trainerPicId].coords) * 4 + 80;
+ yPos = (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80;
}
else
{
trainerPicId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId);
xPos = 32;
- yPos = (8 - gTrainerFrontPicCoords[trainerPicId].coords) * 4 + 80;
+ yPos = (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 80;
}
// Use back pic only if the partner is Steven