From e2dc9012ae081bc7da6cd51cbf9c02ad17e7d9ee Mon Sep 17 00:00:00 2001 From: Marty-D Date: Wed, 12 Jun 2013 12:27:14 -0400 Subject: [PATCH] Add 'nopp' message, fix 'flinch' message. --- js/battle.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/battle.js b/js/battle.js index 5e0a7e460..257f2e966 100644 --- a/js/battle.js +++ b/js/battle.js @@ -2744,13 +2744,17 @@ function Battle(frame, logFrame, noPreload) { break; case 'flinch': self.resultAnim(pokemon, 'Flinched', 'neutral'); - self.message(pokemon.getName() + ' flinched!'); + self.message(pokemon.getName() + ' flinched and couldn\'t move!'); pokemon.removeTurnstatus('focuspunch'); break; case 'attract': self.resultAnim(pokemon, 'Immobilized', 'neutral'); self.message(pokemon.getName() + ' is immobilized by love!'); break; + case 'nopp': + self.message(pokemon.getName() + ' used ' + move.name + '!'); + self.message('But there was no PP left for the move!'); + break; default: self.message('' + pokemon.getName() + (move.name ? ' can\'t use ' + move.name + '' : ' can\'t move') + '!'); break;