diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-19 15:32:25 -0600 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-01-29 14:36:02 -0600 |
| commit | e81838dba397903afbd5bdacf3a54061446e7721 (patch) | |
| tree | cb416163a9e2771ad10f8b083e32e5df54cfeed8 /src/battle_main.c | |
| parent | 5bfd802dbbeeb3af1e43fa839e0c879160343248 (diff) | |
Misc. documentation and move some data into .c files
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 1aeaa25ca..6d04103e5 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3196,7 +3196,7 @@ void SwitchInClearSetData(void) gMoveResultFlags = 0; gDisableStructs[gActiveBattler].isFirstTurn = 2; - gDisableStructs[gActiveBattler].truantUnknownBit = disableStructCopy.truantUnknownBit; + gDisableStructs[gActiveBattler].truantSwitchInHack = disableStructCopy.truantSwitchInHack; gLastMoves[gActiveBattler] = 0; gLastLandedMoves[gActiveBattler] = 0; gLastHitByType[gActiveBattler] = 0; @@ -5492,7 +5492,7 @@ static void HandleAction_UseMove(void) // choose battlescript if (gBattleTypeFlags & BATTLE_TYPE_PALACE - && gProtectStructs[gBattlerAttacker].flag_x10) + && gProtectStructs[gBattlerAttacker].palaceAbleToUseMove) { if (gBattleMons[gBattlerAttacker].hp == 0) { |