Commit graph

2 commits

Author SHA1 Message Date
U-Fish-PC\Daniel
1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
2014-05-19 16:05:19 -04:00
U-Fish-PC\Daniel
24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00