diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:45:26 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-08 02:45:26 -0500 |
commit | 5886f82ef5593fda68687c2e44b2feef76028ce3 (patch) | |
tree | 99c243e92cae64a2b60b5c4b86e161db9072a7b0 /src/battle_main.c | |
parent | 80a4ee11457e82092f52a3aef5362f8b59b68633 (diff) | |
parent | bd157b301dea3526a4c373737dc8167d9a02b168 (diff) |
Merge branch 'master' into extern-cleanup
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 befef364f..2b0c5980e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3277,7 +3277,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; |