Merge pull request #1 from po-devs/master

update
Update enums.h
Update enums.h
Update enums.h
Update moves.cpp
Update proxydatacontainer.h
Merge pull request #800 from ROMaster2/master

Move name difference fix
Merge remote-tracking branch 'origin/master' into battles