diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
commit | 2879fe7fe05166f16b21223c2d4d24f5855c2788 (patch) | |
tree | 3e5525a118c249ab2419a61d7a61b4cb1985462b /include/battle.h | |
parent | 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 (diff) | |
parent | 1e7f4a80c77832d952688206bd7c98e11dba25ba (diff) |
Merge branch 'master' into summary-screen-macros
Diffstat (limited to 'include/battle.h')
-rw-r--r-- | include/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index 94596c75e..d155ca5a0 100644 --- a/include/battle.h +++ b/include/battle.h @@ -175,7 +175,7 @@ struct ProtectStruct u32 targetNotAffected:1; u32 chargingTurn:1; u32 fleeFlag:2; // For RunAway and Smoke Ball. - u32 usedImprisionedMove:1; + u32 usedImprisonedMove:1; u32 loveImmobility:1; u32 usedDisabledMove:1; u32 usedTauntedMove:1; |