Commit Graph

57 Commits

Author SHA1 Message Date
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
Diegoisawesome
9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
ProjectRevoTPP
16c05694fb split remaining rom files. 2017-09-16 21:32:37 -04:00