battle scenes work for the most part, if the trainer's pokemon/wild pokemon are initialized in text files
Merge branch 'master' of ssh://github.com/ahansen3/Cse20212