player can move a little.
merged tilset changes.