5 commits

Author	SHA1	Message	Date
DizzyEggg	0d122bc831	Fix merge conflicts	2018-12-03 17:56:36 +01:00
DizzyEggg	846b5d79e4	Get rid of headers in src/data	2018-12-03 16:10:41 +01:00
Melody	eeb6446da4	add more consistent names	2018-12-02 22:36:09 -05:00
Melody	c7f52c4203	cleans up trainer name defines	2018-12-01 22:49:33 -05:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00