Merge branch 'master' into dev

This commit is contained in:
Maruno17
2020-11-25 22:07:17 +00:00
14 changed files with 28 additions and 25 deletions

View File

@@ -64,7 +64,7 @@ class PokemonDuel
@sprites["player"].x += distance_per_frame
@sprites["playerwindow"].x += distance_per_frame
@sprites["opponent"].x -= distance_per_frame
@sprites["opponentwindow"].x -= distandistance_per_framecePerFrame
@sprites["opponentwindow"].x -= distance_per_frame
Graphics.update
Input.update
pbUpdateSceneMap