diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:27:20 -0500 |
commit | b93d9238261edc6250f5f7bebe8b54643359729a (patch) | |
tree | 7f7a15f04f40a5c811dac3546a98d3ecd7858c81 /include/battle.h | |
parent | eac70acab65dea005da2299e4bb209aff1ded60f (diff) | |
parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) |
Merge branch 'master' into move-tutor
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; |