6 commits

Author	SHA1	Message	Date
Kurt	c1fa685752	Manual Merge	2014-12-11 22:36:39 -08:00
Kurt	981965899a	Standardization	2014-12-11 21:45:01 -08:00
Kurt	333f609bcd	Implemented CGSE corruption warning for ORAS saves.	2014-12-06 17:02:29 -08:00
Kurt	df2a91bb1e	Pokedex Setting	2014-11-29 20:12:37 -08:00
Kurt	73510d261f	ORAS Pokedex form improvements	2014-11-28 23:46:36 -08:00
Kurt	c7d6127bb8	Pokedex branching and minor updates.	2014-11-25 19:55:46 -08:00