Merged new features of map and sprite animation