summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
committerLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
commit554210c5e315e786ddc6eef888e9ff6065ad73f8 (patch)
tree66bb5065902fb10a4ad007e53cb61f90fd68e624 /src/battle_controller_player.c
parent63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff)
Removed trailing spaces in the most relevant files
Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index a85283745..8e7bc9a9f 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -985,17 +985,17 @@ static void Intro_TryShinyAnimShowHealthbox(void)
bool32 battlerAnimsDone = FALSE;
// Start shiny animation if applicable for 1st pokemon
- if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
+ if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
// Start shiny animation if applicable for 2nd pokemon
- if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
+ if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
// Show healthbox after ball anim
- if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
+ if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
{
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].healthboxSlideInStarted)
@@ -1072,7 +1072,7 @@ static void SwitchIn_CleanShinyAnimShowSubstitute(void)
&& gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
{
CopyBattleSpriteInvisibility(gActiveBattler);
-
+
// Reset shiny anim (even if it didn't occur)
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE;