diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-12 21:19:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 21:19:22 -0400 |
| commit | 094b29edb50be48ee65dab0e8866ac65bba4e225 (patch) | |
| tree | b3bca0cb89455a779eb8eb39bba3466e1c7e51a1 /src/psychic.c | |
| parent | 807e03c25d6acd9e5c2bf5337a078b2dfb90f4d9 (diff) | |
| parent | 7c08a10359f404b30ee460460e780f1f66ad5d1f (diff) | |
Merge pull request #117 from jiangzhengwenjz/battle
#107 review commit
Diffstat (limited to 'src/psychic.c')
| -rw-r--r-- | src/psychic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/psychic.c b/src/psychic.c index 181f21810..662320a2b 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -430,13 +430,13 @@ static void sub_80B2ECC(struct Sprite *sprite) u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); u8 rank = GetBattlerSpriteBGPriorityRank(battler); s32 var0 = 1; - u8 toBG_2 = (rank ^ var0) != 0; + bool8 toBG2 = (rank ^ var0) != 0; if (IsBattlerSpriteVisible(battler)) - MoveBattlerSpriteToBG(battler, toBG_2); + MoveBattlerSpriteToBG(battler, toBG2); battler = BATTLE_PARTNER(battlerCopy); if (IsBattlerSpriteVisible(battler)) - MoveBattlerSpriteToBG(battler, toBG_2 ^ var0); + MoveBattlerSpriteToBG(battler, toBG2 ^ var0); } if (!IsContest() && IsDoubleBattle()) { @@ -522,13 +522,13 @@ static void sub_80B3168(struct Sprite *sprite) u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); u8 rank = GetBattlerSpriteBGPriorityRank(battler); s32 var0 = 1; - u8 toBG_2 = (rank ^ var0) != 0; + bool8 toBG2 = (rank ^ var0) != 0; if (IsBattlerSpriteVisible(battler)) - sub_8073128(toBG_2); + sub_8073128(toBG2); battler = battlerCopy ^ 2; if (IsBattlerSpriteVisible(battler)) - sub_8073128(toBG_2 ^ var0); + sub_8073128(toBG2 ^ var0); } sprite->callback = DestroyAnimSprite; } |