125 Commits

Author	SHA1	Message	Date
DizzyEggg	8cd4908fa3	merge bike with master, fix conflicts	2017-12-24 00:08:55 +01:00
DizzyEggg	bcffcb0c1c	pokeblock merge conflicts	2017-12-21 23:12:36 +01:00
DizzyEggg	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +01:00
DizzyEggg	5744356989	decompile trainer see	2017-12-18 23:26:44 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
DizzyEggg	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +01:00
PikalaxALT	6d73bb4b57	Import function labels from Ruby	2017-12-16 10:23:05 -05:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +01:00
DizzyEggg	646664ff29	battle setup file is decompiled	2017-12-01 21:25:13 +01:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
DizzyEggg	10470ef536	start working on battle setup	2017-11-28 23:02:09 +01:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
DizzyEggg	a3b5af17ea	berry blender is done	2017-11-19 22:48:46 +01:00
DizzyEggg	3de416662b	wild encounter, fix merge conflicts	2017-11-18 21:45:52 +01:00
DizzyEggg	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +01:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
DizzyEggg	a2a17bba92	more work on wild encounter	2017-11-17 17:50:07 +01:00
DizzyEggg	616edd6c3f	daycare file is decompiled	2017-11-15 20:08:31 +01:00
DizzyEggg	95949c772e	more of daycare done	2017-11-14 21:43:23 +01:00
DizzyEggg	a972de7bca	start working on daycare	2017-11-14 20:23:25 +01:00
DizzyEggg	fa3691ca40	start pss	2017-11-11 14:45:08 +01:00
DizzyEggg	31e0b468c7	move from raq scene to walda phrase	2017-10-20 20:46:26 +02:00
DizzyEggg	cda5c5f925	start working on walda phrase	2017-10-20 18:52:01 +02:00
PikalaxALT	70eaf5d1be	port def_special	2017-10-14 16:28:22 -04:00
PikalaxALT	7cf9693551	Decompile special pointers	2017-10-14 14:26:25 -04:00