Merge branch 'master' of https://github.com/dannye/pokered-gen-II into music

Conflicts:
	main.asm
Merge branch 'music' of https://github.com/dannye/pokered-gen-II into music