diff options
author | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
---|---|---|
committer | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
commit | c89b14f5ef16609779f9bd85cf4e4efa090caad7 (patch) | |
tree | 850ae8e4df1d421e39f54ab8d0a0da9d9ffb7e18 /src/battle_ai_script_commands.c | |
parent | e129f4864fa342fdca46399f216ee0c0c46c26b4 (diff) | |
parent | 43316ffae83d49be09969e291779cc9e448b83a1 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
Diffstat (limited to 'src/battle_ai_script_commands.c')
-rw-r--r-- | src/battle_ai_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 1201a855a..e89d308f5 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -2191,7 +2191,7 @@ static void BattleAICmd_if_level_cond(void) static void BattleAICmd_if_target_taunted(void) { - if (gDisableStructs[gBattlerTarget].tauntTimer1 != 0) + if (gDisableStructs[gBattlerTarget].tauntTimer != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -2199,7 +2199,7 @@ static void BattleAICmd_if_target_taunted(void) static void BattleAICmd_if_target_not_taunted(void) { - if (gDisableStructs[gBattlerTarget].tauntTimer1 == 0) + if (gDisableStructs[gBattlerTarget].tauntTimer == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; |