better savepoint locations
Merge branch 'master' into mountains

Conflicts:
	src/maps/black-caverns-2.tmx
	src/maps/black-caverns.tmx
Update gay-island-3.tmx
Merge pull request #1221 from didory123/mountains

better savepoint locations