summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-24 15:25:20 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-24 15:25:20 +0200
commitbffcd426cf1414287443c67d955fb36b861dbd91 (patch)
tree910519b569264b3735cb9c185614d2323530af0a /src/battle_controller_player.c
parent1f3a867a0b05c52344c5a145db3272e653deb697 (diff)
link opponent controller is done
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index b022d3f87..cbf924235 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2285,7 +2285,7 @@ static void DoSwitchOutAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
- DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_MON);
+ DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
gBattleBankFunc[gActiveBank] = sub_8059744;
}
break;
@@ -2453,7 +2453,7 @@ static void PlayerHandleFaintAnimation(void)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
- PlaySE12WithPanning(SE_POKE_DEAD, -64);
+ PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
gSprites[gBankSpriteIds[gActiveBank]].callback = sub_8039C00;
@@ -2911,7 +2911,7 @@ static void PlayerHandleHitAnimation(void)
}
else
{
- gDoingBattleAnim = 1;
+ gDoingBattleAnim = TRUE;
gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
DoHitAnimHealthboxEffect(gActiveBank);
gBattleBankFunc[gActiveBank] = DoHitAnimBlinkSpriteEffect;