Commit Graph

9 Commits

Author SHA1 Message Date
luckytyphlosion
d2ed7674f4 Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
2015-08-30 17:55:02 -04:00
U-Daniel-PC\Daniel
8f2edd9c41 Build only Yellow
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
2015-08-01 17:32:39 -04:00
dannye
4670a1ddae Swap trade center and battle center
also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102
2015-07-16 23:21:57 -05:00
IIMarckus
1d579928dc Modularize the beach house. 2014-10-17 12:16:52 -06:00
IIMarckus
7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
U-Fish-PC\Daniel
391bbad29e A little more map name consistency 2014-04-06 09:33:02 -04:00
U-Fish-PC\Daniel
f8452ebeb8 Use dimension constants in warp data and add map name consisntency 2014-04-05 10:47:23 -04:00
U-Fish-PC\Daniel
23c7161bbc Clean up constants 2013-12-11 10:37:17 -05:00
yenatch
5dc5feb29c split related constants into constants/ 2013-12-05 01:34:12 -05:00