dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

battle interface review changes

Browse Source
This commit is contained in:
DizzyEggg
2017-10-20 19:24:46 +02:00
parent b65da491a9
commit ccd7e8b3b1
4 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/battle_anim.c
View File

@@ -1284,39 +1284,39 @@ s8 BattleAnimAdjustPanning(s8 pan)
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].flag_x10)
{
if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
pan = PAN_ATTACKER_OPPONENT;
pan = PAN_SIDE_OPPONENT;
else
pan = PAN_ATTACKER_PLAYER;
pan = PAN_SIDE_PLAYER;
}
else if (IsContest())
{
if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_ATTACKER_OPPONENT)
if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_SIDE_OPPONENT)
pan *= -1;
}
else if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER)
{
if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER)
{
if (pan == PAN_ATTACKER_OPPONENT)
pan = PAN_ATTACKER_PLAYER;
else if (pan != PAN_ATTACKER_PLAYER)
if (pan == PAN_SIDE_OPPONENT)
pan = PAN_SIDE_PLAYER;
else if (pan != PAN_SIDE_PLAYER)
pan *= -1;
}
}
else if (GetBankSide(gAnimBankTarget) == SIDE_OPPONENT)
{
if (pan == PAN_ATTACKER_PLAYER)
pan = PAN_ATTACKER_OPPONENT;
if (pan == PAN_SIDE_PLAYER)
pan = PAN_SIDE_OPPONENT;
}
else
{
pan *= -1;
}
if (pan > PAN_ATTACKER_OPPONENT)
pan = PAN_ATTACKER_OPPONENT;
else if (pan < PAN_ATTACKER_PLAYER)
pan = PAN_ATTACKER_PLAYER;
if (pan > PAN_SIDE_OPPONENT)
pan = PAN_SIDE_OPPONENT;
else if (pan < PAN_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER;
return pan;
}
@@ -1326,9 +1326,9 @@ s8 BattleAnimAdjustPanning2(s8 pan)
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].flag_x10)
{
if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER)
pan = PAN_ATTACKER_OPPONENT;
pan = PAN_SIDE_OPPONENT;
else
pan = PAN_ATTACKER_PLAYER;
pan = PAN_SIDE_PLAYER;
}
else
{