mirror of
				https://github.com/Klagarge/PokeHES.git
				synced 2025-10-31 03:39:16 +00:00 
			
		
		
		
	Merge branch 'master' into addmaps
This commit is contained in:
		| @@ -19,7 +19,7 @@ public class ScreenPlayer { | |||||||
|         //p = new Player(8, 15, "desert"); |         //p = new Player(8, 15, "desert"); | ||||||
|         p = new Player(4, 2, "21RI"); |         p = new Player(4, 2, "21RI"); | ||||||
|  |  | ||||||
|          |         b = new Battle(e); | ||||||
|  |  | ||||||
|         // Create both type of screen and record for reuse |         // Create both type of screen and record for reuse | ||||||
|         screenManager.registerScreen(ScreenMap.class); |         screenManager.registerScreen(ScreenMap.class); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user