More refactoring

Things that still need work
- add well-named "macro" globals for indexing 2d arrays
- tidy up movement
- tidy up interaction
- rescript test battle