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 /src/battle_main.c | |
parent | 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 (diff) | |
parent | 1e7f4a80c77832d952688206bd7c98e11dba25ba (diff) |
Merge branch 'master' into summary-screen-macros
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 043e75808..853dafe01 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3279,7 +3279,7 @@ void FaintClearSetData(void) gProtectStructs[gActiveBattler].targetNotAffected = 0; gProtectStructs[gActiveBattler].chargingTurn = 0; gProtectStructs[gActiveBattler].fleeFlag = 0; - gProtectStructs[gActiveBattler].usedImprisionedMove = 0; + gProtectStructs[gActiveBattler].usedImprisonedMove = 0; gProtectStructs[gActiveBattler].loveImmobility = 0; gProtectStructs[gActiveBattler].usedDisabledMove = 0; gProtectStructs[gActiveBattler].usedTauntedMove = 0; |