Add some naming screen stuff.
Merge pull request #134 from iimarckus/oakintro

Add some naming screen stuff.
Merge https://github.com/kanzure/pokecrystal

Conflicts:
	main.asm
Merge pull request #28 from iimarckus/master

merge naming stuff
map headers for Tickle Woods
make Tickle Woods work
Merge pull request #29 from kanzure/map-ticklewoods

map: Tickle Woods
StarterCity recreated
headers for Barrier Creator map
use barriers for border
warp kriss -> barrier creator
Merge pull request #31 from kanzure/map-barriercreator

map: Barrier Creator
Merge pull request #30 from tysonrss/master

StarterCity recreated
Merge https://github.com/kanzure/pokecrystal-demo

Conflicts:
	constants.asm
	main.asm
	maps/map_headers.asm
	maps/second_map_headers.asm