diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-09-30 23:17:04 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-09-30 23:17:04 -0700 |
| commit | 94d4c89e093b76a0964114bd7a370046e70e965e (patch) | |
| tree | ff6a162f91628d6e05eb14144448ea5c1c4d80fa /battle | |
| parent | 7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff) | |
| parent | d31dbfc7804cc0fa0a48a28779b8f9db1a0032c8 (diff) | |
Merge pull request #209 from yenatch/script-commands
use updated script commands from pokemontools
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | battle/moves/move_effects.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 87196653a..16d03b5e9 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -11015,7 +11015,7 @@ Function0x37e77: ; 37e77 BattleCommandaa: ; 37e80 -; wait +; movedelay ; Wait 40 frames. ld c, 40 jp DelayFrames diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index a17a9a7d5..1e3bd4586 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -2201,7 +2201,7 @@ Teleport: BeatUp: checkobedience usedmovetext - wait + movedelay doturn startloop effect0x0a |