165 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	4abc2eea8a	ram vars to C files	2017-12-19 17:33:07 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +01:00
DizzyEggg	37ae6a7758	move more pokeblock data to C and label	2017-12-10 16:38:27 +01:00
DizzyEggg	fb30acbc30	pokeblock feed is decompiled	2017-12-10 15:04:03 +01:00
DizzyEggg	bb1ae5f857	Merge branch 'master' into decompile_use_pokeblock	2017-12-09 21:24:47 +01:00
DizzyEggg	6561b62986	start pokeblock feed	2017-12-09 21:23:40 +01:00
camthesaxman	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06: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
Diegoisawesome	18c6b8efc2	Merge pull request #120 from PikalaxALT/unk_text_util ... Decompile asm/unk_text_util.s	2017-11-27 18:39:50 -06:00
Diegoisawesome	db87e2db4c	Merge pull request #117 from ProjectRevoTPP/load_save ... finish load_save.c	2017-11-27 15:19:08 -06:00
Cameron Hall	6e317c6463	Merge pull request #124 from DizzyEggg/dump_battlescripts ... Dump Battle Scripts	2017-11-27 14:00:29 -06:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
DizzyEggg	d48392e677	change battle variables names	2017-11-26 18:07:00 +01:00
DizzyEggg	1bb5b1fd07	more battle labels	2017-11-26 17:15:28 +01:00
DizzyEggg	8c30c42c36	more labelling and changes	2017-11-26 14:17:02 +01:00
DizzyEggg	9886eeb5d8	fix, rename, label battle labels and battlescripts	2017-11-26 13:26:58 +01:00
PikalaxALT	ef18d3b8ec	Decompile asm/unk_text_util.s	2017-11-23 11:23:05 -05:00
ProjectRevoTPP	9644f44982	finish load_save.c	2017-11-22 21:06:30 -05:00
DizzyEggg	ad3a97e178	berry blender merge conflicts	2017-11-19 22:58:13 +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
Diegoisawesome	5dc8beb034	Merge pull request #112 from DizzyEggg/decompile_recorded_battle ... Decompile recorded battle	2017-11-18 13:29:27 -06:00
DizzyEggg	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +01:00
DizzyEggg	d0245cf8d2	recorded battle merge conflicts fix	2017-11-17 19:34:55 +01:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
DizzyEggg	b37d8c0821	start decompiling wild encounter	2017-11-16 20:38:10 +01:00
DizzyEggg	1e79d53d2f	merge daycare with master	2017-11-15 17:18:05 +01:00
PikalaxALT	89b695278d	Merge branch 'master' into heal_location	2017-11-15 09:01:56 -05:00
Diegoisawesome	ce0e5cbfe4	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps	2017-11-15 00:47:34 -06:00
DizzyEggg	95949c772e	more of daycare done	2017-11-14 21:43:23 +01:00
DizzyEggg	3b43668286	more recorded battle done	2017-11-13 00:10:34 +01:00
DizzyEggg	c4674735d2	start working on recorded battle	2017-11-12 22:59:36 +01:00
Diegoisawesome	2e40384fa2	Extract baseroms from event_scripts	2017-11-10 18:12:18 -06:00
DizzyEggg	19d9cff2ff	static variables to hall of fame c	2017-11-06 18:57:22 +01:00
DizzyEggg	bd56bb073f	start working on hall of fame	2017-11-05 12:05:07 +01:00
PikalaxALT	ab3b8cd51a	Merge branch 'master' into heal_location	2017-11-02 07:59:29 -04:00
PikalaxALT	17fd3bccf7	Merge branch 'master' into secret_base	2017-11-01 23:39:54 -04:00
PikalaxALT	9cfdc8b7e8	Merge branch 'master' into heal_location	2017-11-01 23:37:41 -04:00
DizzyEggg	6cb1c4fd6e	fix merge conflicts, evo scene	2017-10-31 19:36:25 +01:00
PikalaxALT	76bb397e83	region_map.c through sub_8122CF8	2017-10-29 19:33:53 -04:00
DizzyEggg	51df918c04	evo scene file is done	2017-10-29 16:15:23 +01:00
PikalaxALT	0a060ae254	Start decompiling field_region_map	2017-10-29 10:38:25 -04:00
DizzyEggg	e8903fb4dd	start workin on evo scene	2017-10-27 18:52:21 +02:00
DizzyEggg	2d14e6bb67	name one var	2017-10-27 13:29:18 +02:00