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

..

maps

Merge branch 'master' of https://github.com/huderlem/pokered into pull-data

2014-05-19 16:05:19 -04:00

credits_text.asm

Pull more data out of main.asm

2014-05-19 08:05:48 -04:00

item_names.asm

Pull most data out of main.asm

2014-05-16 19:50:38 -04:00

map_names.asm

Pull most data out of main.asm

2014-05-16 19:50:38 -04:00

monster_names.asm

Pull most data out of main.asm

2014-05-16 19:50:38 -04:00

move_names.asm

Get rid of globals.asm. Use ::s to export labels between objects.

2014-01-27 16:24:13 -05:00

oakspeech.asm

Get rid of globals.asm. Use ::s to export labels between objects.

2014-01-27 16:24:13 -05:00

pokedex.asm

Get rid of globals.asm. Use ::s to export labels between objects.

2014-01-27 16:24:13 -05:00

trainer_names.asm

Pull most data out of main.asm

2014-05-16 19:50:38 -04:00

type_names.asm

Pull more data out of main.asm

2014-05-19 08:05:48 -04:00