Use dimension constants in warp data and add map name consisntency
A little more map name consistency
combine audio and music folders
Merge https://github.com/yenatch/pokered

Conflicts:
	main.asm
Replace one-byte sound effect pointers
Replace item constants
Merge remote-tracking branch 'yenatch/png'
hotfix: Bump pokemontools so gfx.py doesn't look for a baserom.
Merge branch 'master' of https://github.com/iimarckus/pokered
Merge branch 'master' of https://github.com/dannye/pokered
Merge branch 'master' of https://github.com/dannye/pokered-gen-II into music

Conflicts:
	audio.asm
	audio/music/unusedsong.asm