summaryrefslogtreecommitdiff
path: root/src/battle_controller_safari.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-01-16 14:01:31 -0600
committercamthesaxman <cameronghall@cox.net>2018-01-16 14:01:31 -0600
commit157b88b6dbfa7816cac9c6cf2ef20bd70a573b10 (patch)
tree5ee8f522de06636ed00050c5fa2e2c776942a73d /src/battle_controller_safari.c
parent11cb3275cc53c2bcea4fdcfe11d9d9d429ee9c02 (diff)
identity -> position
Diffstat (limited to 'src/battle_controller_safari.c')
-rw-r--r--src/battle_controller_safari.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 682e8333d..a04f06d8c 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -378,7 +378,7 @@ static void SafariHandleReturnMonToBall(void)
static void SafariHandleDrawTrainerPic(void)
{
DecompressTrainerBackPic(gSaveBlock2Ptr->playerGender, gActiveBank);
- sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankIdentity(gActiveBank));
+ sub_806A12C(gSaveBlock2Ptr->playerGender, GetBankPosition(gActiveBank));
gBankSpriteIds[gActiveBank] = CreateSprite(
&gUnknown_0202499C,
80,
@@ -415,7 +415,7 @@ static void SafariHandleSuccessBallThrowAnim(void)
{
gBattleSpritesDataPtr->animationData->ballThrowCaseId = BALL_3_SHAKES_SUCCESS;
gDoingBattleAnim = TRUE;
- InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+ InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
}
@@ -425,7 +425,7 @@ static void SafariHandleBallThrowAnim(void)
gBattleSpritesDataPtr->animationData->ballThrowCaseId = ballThrowCaseId;
gDoingBattleAnim = TRUE;
- InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(IDENTITY_OPPONENT_MON1), B_ANIM_SAFARI_BALL_THROW);
+ InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, GetBankByIdentity(B_POSITION_OPPONENT_LEFT), B_ANIM_SAFARI_BALL_THROW);
gBattleBankFunc[gActiveBank] = CompleteOnSpecialAnimDone;
}