Merge remote-tracking branch 'origin/master' master
Merge remote-tracking branch 'origin/master'

--- a/src/com/dryerzinia/pokemon/ui/menu/TextMenu.java
+++ b/src/com/dryerzinia/pokemon/ui/menu/TextMenu.java
@@ -48,7 +48,6 @@
 	private TextMenuListener listener;

 	

 	private boolean hasPressedEnter;

-	private boolean hasUpdatedListener;

 	

 	public TextMenu(String text) {

 		List<String> lines = new ArrayList<String>();

@@ -88,16 +87,20 @@
 

 	@Override

 	public void handleInput() {

-		if (ClientState.inputDevice.isButtonDown(InputController.Button.A)) {			

-			if (listener != null) {

-				listener.buttonPressed();

+		if (ClientState.inputDevice.isButtonDown(InputController.Button.A)) {

+			

+			if (!hasPressedEnter) {

+				if (listener != null) {

+					listener.buttonPressed();

+				}

+				

+				setSpeed(Speed.FAST);

+				if (!isAnimating()) {

+					advanceText();

+				}

+				

+				hasPressedEnter = true;

 			}

-			

-			setSpeed(Speed.FAST);

-			if (!hasPressedEnter && !isAnimating())

-				advanceText();

-			

-			hasPressedEnter = true;		

 			

 		} else {

 			// enter is not being pressed