diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-10-21 00:58:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 00:58:16 -0400 |
| commit | f39a3dff9ca23f96ae5f166122ed6af3d4d3d8e0 (patch) | |
| tree | f2e1ee0f20111b1b39ee1d83d8464a31cf237122 /engine/battle/effect_commands.asm | |
| parent | 12666e3c70deb3a8859a22d32e31967cb971b69d (diff) | |
| parent | 3b20a18200befcf7da9a88ed5ae4fb57280ad8aa (diff) | |
Merge pull request #569 from Rangi42/master
Identify BATTLEACTION_D and _E (thanks, ax6)
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 366898c8c..95a0475bf 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -15,7 +15,7 @@ DoEnemyTurn: jr z, DoTurn ld a, [wBattleAction] - cp BATTLEACTION_E + cp BATTLEACTION_STRUGGLE jr z, DoTurn cp BATTLEACTION_SWITCH1 ret nc |