diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /battle/effects/curse.asm | |
parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) |
Fix merge conflicts
Diffstat (limited to 'battle/effects/curse.asm')
-rw-r--r-- | battle/effects/curse.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm index 65376a4aa..06706aba1 100644 --- a/battle/effects/curse.asm +++ b/battle/effects/curse.asm @@ -44,10 +44,10 @@ BattleCommand54: ; 37588 call AnimateCurrentMove ld a, $2 call Function36532 - call SwitchTurn + call BattleCommand_SwitchTurn call BattleCommand8d call ResetMiss - call SwitchTurn + call BattleCommand_SwitchTurn call BattleCommand70 call BattleCommand8c call ResetMiss |