Commit graph

4 commits

Author SHA1 Message Date
dannye e25a7148d0 Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/town_map.asm
2015-07-14 00:58:09 -05:00
YamaArashi 4a8c9993ad named wram variables 2015-07-12 23:00:48 -07:00
U-Daniel-PC\Daniel 08b939375e EOL Windows->UNIX 2015-06-01 22:13:46 -05:00
U-Fish-PC\Daniel 23c7161bbc Clean up constants 2013-12-11 10:37:17 -05:00