304 commits

Author	SHA1	Message	Date
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
Avara	c8ac4e8ce4	Opponents fixed and moved~	2017-12-12 02:58:57 +00:00
camthesaxman	c681b482c2	convert more constants	2017-12-11 12:27:51 -06:00
camthesaxman	caa13f8777	convert some constants to C headers	2017-12-05 11:55:48 -06:00