diff options
| author | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
| commit | 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch) | |
| tree | 4ac69544094baaa620b1e8556ddf79715db4fde3 /src/battle_ai_script_commands.c | |
| parent | 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff) | |
| parent | ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff) | |
Merge remote-tracking branch 'upstream/master' into event-flags
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; |