mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-10-31 19:49:16 +00:00 
			
		
		
		
	Merge branch 'master' into battlescreen-display
This commit is contained in:
		| @@ -48,6 +48,7 @@ public class Battle { | ||||
|         } | ||||
|         else if( getLineSpeech() == 5  || getLineSpeech() == 6){ | ||||
|             finish(); | ||||
|             e.recoveredTime = 0; | ||||
|         } | ||||
|         else if(0 < getLineSpeech() && getLineSpeech() < 4){ | ||||
|             checkAnswer(answer); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user