pokeyellow/text/maps/daycare.asm, branch remove-pip

overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE

2015-10-29T18:23:30+00:00

Also make replace.sh take args

Merge branch 'master' of https://github.com/iimarckus/pokered

2015-08-30T21:55:02+00:00

Doesn't build.

Remove (incorrect) address comments

2015-08-01T21:34:51+00:00

Conflicts:
	text.asm

text.o

2015-08-01T21:16:11+00:00

Conflicts:
	main.asm
	text.asm
	text/maps/cerulean_trade_house.asm
	text/maps/copycats_house_1f.asm
	text/maps/daycare_2.asm
	text/maps/museum_2f.asm
	text/maps/oaks_lab.asm
	text/maps/pewter_gym.asm
	text/maps/route_9_1.asm
	text/maps/school.asm
	text/maps/vermilion_gym_1.asm
	wram.asm
	yellow/text.asm