7 Commits

Author	SHA1	Message	Date
DizzyEggg	9ee9a20152	fix merge conflicts	2017-09-21 10:50:15 +02:00
PikalaxALT	27903a102b	Merge branch 'master' into berry_fix_program	2017-09-20 23:18:20 -04:00
DizzyEggg	148b995189	finish egg hatch, clean up headers	2017-09-19 14:27:46 +02:00
DizzyEggg	c253bf5e75	add important headers, const ptrs and egg hatch start	2017-09-18 18:36:05 +02:00
PikalaxALT	8604291b0f	Start decomp	2017-09-18 09:23:06 -04:00
PikalaxALT	052c9f0234	Fix header guards	2017-09-16 15:13:26 -04:00
PikalaxALT	54c8580d34	rom_81700F8	2017-09-15 22:12:45 -04:00