pokeyellow/engine/oak_speech2.asm, branch remove-pip

More syncing with pokered

2016-06-11T22:10:37+00:00

from April 8, 2016 to present

Clean up white space

2016-06-06T06:22:22+00:00

oak_speech2.asm

2015-11-01T20:42:29+00:00

Also replace W_RIVALNAME with wRivalName

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

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

Doesn't build.

More joypad constants

2015-08-11T05:34:32+00:00

Replace hardcoded name lengths with NAME_LENGTH

2015-08-11T04:51:20+00:00

Use more lb

2015-08-05T21:25:58+00:00

and other clean up

Build only Yellow

2015-08-01T21:32:39+00:00

Conflicts:
	gfx/intro_nido_1.6x6.png
	gfx/intro_nido_2.6x6.png
	gfx/intro_nido_3.6x6.png
	gfx/redgreenversion.png
	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
	yellow/main.asm

Consolidate coord macros

2015-07-18T20:52:03+00:00

fix variable naming

2015-07-18T15:17:46+00:00