From e81838dba397903afbd5bdacf3a54061446e7721 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 19 Jan 2019 15:32:25 -0600 Subject: Misc. documentation and move some data into .c files --- src/battle_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_main.c') 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) { -- cgit v1.2.3