Add missing use of ALL_MOVES_MASK
This commit is contained in:
+1
-3
@@ -1110,7 +1110,6 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
|
||||
return unusableMoves;
|
||||
}
|
||||
|
||||
#define ALL_MOVES_MASK ((1 << MAX_MON_MOVES) - 1)
|
||||
bool8 AreAllMovesUnusable(void)
|
||||
{
|
||||
u8 unusable = CheckMoveLimitations(gActiveBattler, 0, MOVE_LIMITATIONS_ALL);
|
||||
@@ -1127,7 +1126,6 @@ bool8 AreAllMovesUnusable(void)
|
||||
|
||||
return (unusable == ALL_MOVES_MASK);
|
||||
}
|
||||
#undef ALL_MOVES_MASK
|
||||
|
||||
u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
|
||||
{
|
||||
@@ -3954,7 +3952,7 @@ u8 IsMonDisobedient(void)
|
||||
if (calc < obedienceLevel)
|
||||
{
|
||||
calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], MOVE_LIMITATIONS_ALL);
|
||||
if (calc == 0xF) // all moves cannot be used
|
||||
if (calc == ALL_MOVES_MASK) // all moves cannot be used
|
||||
{
|
||||
// Randomly select, then print a disobedient string
|
||||
// B_MSG_LOAFING, B_MSG_WONT_OBEY, B_MSG_TURNED_AWAY, or B_MSG_PRETEND_NOT_NOTICE
|
||||
|
||||
Reference in New Issue
Block a user