diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-14 23:22:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 23:22:41 -0500 |
| commit | 15c2856b24c91d1fe4c3d5f3fe4d84d87827f386 (patch) | |
| tree | 3367bb9a7ae8b701acf43cb8df6e137cf94f72bb /src/battle_ai_script_commands.c | |
| parent | c61142188292a0edfe9154a93e440739560490cf (diff) | |
| parent | 69cfe5ad01f135e16c330891d3b6d9fc7853e632 (diff) | |
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
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 952868e11..b7679429c 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -624,8 +624,8 @@ static void RecordLastUsedMoveByTarget(void) { if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; - if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] != gLastMoves[gBattlerTarget] // HACK: This redundant condition is a hack to make the asm match. - && BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == MOVE_NONE) + + if (BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] == MOVE_NONE) { BATTLE_HISTORY->usedMoves[gBattlerTarget].moves[i] = gLastMoves[gBattlerTarget]; break; |