Merge remote-tracking branch 'iimarckus/master' into resplit-audio

Conflicts:
	main.asm
bump pokemontools for merging the previous bump

this brings pokemontools up to date, including some map editor fixes