summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_util.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/battle_util.c b/src/battle_util.c
index 26dff2584..875244d79 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -492,17 +492,17 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
enum
{
- ENDTURN_ORDER,
- ENDTURN_REFLECT,
- ENDTURN_LIGHT_SCREEN,
- ENDTURN_MIST,
- ENDTURN_SAFEGUARD,
- ENDTURN_WISH,
- ENDTURN_RAIN,
- ENDTURN_SANDSTORM,
- ENDTURN_SUN,
- ENDTURN_HAIL,
- ENDTURN_FIELD_COUNT,
+ ENDTURN_ORDER,
+ ENDTURN_REFLECT,
+ ENDTURN_LIGHT_SCREEN,
+ ENDTURN_MIST,
+ ENDTURN_SAFEGUARD,
+ ENDTURN_WISH,
+ ENDTURN_RAIN,
+ ENDTURN_SANDSTORM,
+ ENDTURN_SUN,
+ ENDTURN_HAIL,
+ ENDTURN_FIELD_COUNT,
};
u8 DoFieldEndTurnEffects(void)
@@ -765,24 +765,24 @@ enum
{
ENDTURN_INGRAIN,
ENDTURN_ABILITIES,
- ENDTURN_ITEMS1,
- ENDTURN_LEECH_SEED,
- ENDTURN_POISON,
- ENDTURN_BAD_POISON,
- ENDTURN_BURN,
- ENDTURN_NIGHTMARES,
- ENDTURN_CURSE,
- ENDTURN_WRAP,
- ENDTURN_UPROAR,
- ENDTURN_THRASH,
- ENDTURN_DISABLE,
- ENDTURN_ENCORE,
- ENDTURN_LOCK_ON,
- ENDTURN_CHARGE,
- ENDTURN_TAUNT,
- ENDTURN_YAWN,
- ENDTURN_ITEMS2,
- ENDTURN_BATTLER_COUNT
+ ENDTURN_ITEMS1,
+ ENDTURN_LEECH_SEED,
+ ENDTURN_POISON,
+ ENDTURN_BAD_POISON,
+ ENDTURN_BURN,
+ ENDTURN_NIGHTMARES,
+ ENDTURN_CURSE,
+ ENDTURN_WRAP,
+ ENDTURN_UPROAR,
+ ENDTURN_THRASH,
+ ENDTURN_DISABLE,
+ ENDTURN_ENCORE,
+ ENDTURN_LOCK_ON,
+ ENDTURN_CHARGE,
+ ENDTURN_TAUNT,
+ ENDTURN_YAWN,
+ ENDTURN_ITEMS2,
+ ENDTURN_BATTLER_COUNT
};
u8 DoBattlerEndTurnEffects(void)
@@ -1303,21 +1303,21 @@ void TryClearRageStatuses(void)
enum
{
- CANCELLER_FLAGS,
- CANCELLER_ASLEEP,
- CANCELLER_FROZEN,
- CANCELLER_TRUANT,
- CANCELLER_RECHARGE,
- CANCELLER_FLINCH,
- CANCELLER_DISABLED,
- CANCELLER_TAUNTED,
- CANCELLER_IMPRISONED,
- CANCELLER_CONFUSED,
- CANCELLER_PARALYSED,
- CANCELLER_IN_LOVE,
- CANCELLER_BIDE,
- CANCELLER_THAW,
- CANCELLER_END,
+ CANCELLER_FLAGS,
+ CANCELLER_ASLEEP,
+ CANCELLER_FROZEN,
+ CANCELLER_TRUANT,
+ CANCELLER_RECHARGE,
+ CANCELLER_FLINCH,
+ CANCELLER_DISABLED,
+ CANCELLER_TAUNTED,
+ CANCELLER_IMPRISONED,
+ CANCELLER_CONFUSED,
+ CANCELLER_PARALYSED,
+ CANCELLER_IN_LOVE,
+ CANCELLER_BIDE,
+ CANCELLER_THAW,
+ CANCELLER_END,
};
u8 AtkCanceller_UnableToUseMove(void)