16 Commits

Author	SHA1	Message	Date
DizzyEggg	6cb1c4fd6e	fix merge conflicts, evo scene	2017-10-31 19:36:25 +01:00
DizzyEggg	51df918c04	evo scene file is done	2017-10-29 16:15:23 +01:00
DizzyEggg	3d1c16523e	start working on battle controllers, especially player	2017-10-21 17:32:35 +02:00
DizzyEggg	11bead31e9	battle interface is done	2017-10-19 15:28:41 +02:00
Diegoisawesome	924c0c6b5a	Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd	2017-10-13 20:29:11 -05:00
Diegoisawesome	f1b6358047	Port/decomp scrcmd	2017-10-12 02:06:19 -05:00
DizzyEggg	ab03b03c4b	decompile reshow battle screen	2017-10-09 18:18:40 +02:00
DizzyEggg	342e616d4b	battle2 more and more and more	2017-10-06 00:12:01 +02:00
DizzyEggg	69928d3904	battle 4 up to 0xE5	2017-09-27 23:43:45 +02:00
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