6 commits

Author	SHA1	Message	Date
DizzyEggg	b65da491a9	merge with master, fix conflicts	2017-10-20 10:49:21 +02:00
DizzyEggg	9ccc472b97	label some functions	2017-10-19 18:25:48 +02:00
DizzyEggg	11bead31e9	battle interface is done	2017-10-19 15:28:41 +02:00
DizzyEggg	ee6bdc9068	more battle interface	2017-10-18 23:52:21 +02:00
DizzyEggg	752ce9b90d	start working on battle anim	2017-10-14 16:55:25 +02:00
DizzyEggg	ab03b03c4b	decompile reshow battle screen	2017-10-09 18:18:40 +02:00