338 Commits

Author	SHA1	Message	Date
Diegoisawesome	54da963091	Merge pull request #122 from PikalaxALT/unk_81BAD84 ... Unk 81 bad84	2017-11-28 10:11:49 -06:00
PikalaxALT	b9d08ed83b	Merge branch 'master' into unk_81BAD84	2017-11-27 20:08:34 -05:00
PikalaxALT	41eb2ed59e	Merge branch 'master' into coins	2017-11-27 20:06:38 -05: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
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
PikalaxALT	772da493f9	data/unk_81BAD84	2017-11-23 21:15:57 -05:00
PikalaxALT	c5dcbb78ce	unk_81BAD84	2017-11-23 21:04:15 -05:00
PikalaxALT	89d938ea9e	Finish decompiling coins	2017-11-23 13:53:51 -05: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	f8b40754c7	wild encounter done	2017-11-18 12:27:10 +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
Diegoisawesome	c0d180a870	Merge pull request #100 from PikalaxALT/heal_location ... Heal location and Field Region Map	2017-11-15 23:24:45 -06:00
Diegoisawesome	6a73c89e54	Merge pull request #113 from DizzyEggg/decompile_pss ... Start Pokemon Storage System	2017-11-15 20:55:38 -06:00
DizzyEggg	ba00a1c688	daycare file fully done	2017-11-15 22:12:18 +01:00
DizzyEggg	616edd6c3f	daycare file is decompiled	2017-11-15 20:08:31 +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
Diegoisawesome	3fb2a488f9	Merge pull request #111 from DizzyEggg/decompile_battle5 ... Decompile battle5	2017-11-14 16:52:40 -06:00
Diegoisawesome	118bf4f4b1	Merge pull request #108 from DizzyEggg/decompile_starter_choose ... Decompile starter choose	2017-11-14 16:41:53 -06:00
DizzyEggg	a972de7bca	start working on daycare	2017-11-14 20:23:25 +01:00
DizzyEggg	516a5b2219	fix merge conflicts, review changes	2017-11-13 20:00:20 +01:00
Diegoisawesome	d1fe93bf4a	Merge pull request #105 from DizzyEggg/dump_things ... Get rid of a couple of baseroms	2017-11-13 12:46:40 -06:00
DizzyEggg	3e1f3d0e1e	recorded battle file is decompiled	2017-11-13 19:01:23 +01:00
DizzyEggg	c4674735d2	start working on recorded battle	2017-11-12 22:59:36 +01:00
DizzyEggg	47a8c6c432	battle5 decompiled and renamed	2017-11-12 16:39:21 +01:00
DizzyEggg	fa3691ca40	start pss	2017-11-11 14:45:08 +01:00
Diegoisawesome	a6c30ba951	More file organization	2017-11-10 13:20:27 -06:00
Diegoisawesome	6ecad1a59d	Organize map data	2017-11-10 12:39:00 -06:00
DizzyEggg	045e7d6382	split starter choose data	2017-11-08 20:53:39 +01:00
DizzyEggg	61408456e8	starter choose file is decompiled	2017-11-08 18:05:47 +01:00
DizzyEggg	a729e9838e	move data to hall of fame c file	2017-11-06 18:41:32 +01:00
DizzyEggg	bd56bb073f	start working on hall of fame	2017-11-05 12:05:07 +01:00
DizzyEggg	4d4d642285	dump berry blender and script menu	2017-11-04 22:40:36 +01:00
DizzyEggg	352102a07a	Merge branch 'master' into decompile_battle_7	2017-11-04 16:12:45 +01:00
DizzyEggg	6c8155074b	battle 7 is decompiled	2017-11-04 16:11:13 +01:00
DizzyEggg	5243285ab2	start working on battle 7	2017-11-02 18:19:49 +01:00
PikalaxALT	ab3b8cd51a	Merge branch 'master' into heal_location	2017-11-02 07:59:29 -04:00
Diegoisawesome	af197ccd3b	Merge pull request #98 from PikalaxALT/bard_music ... Decompile bard music	2017-11-01 23:18:10 -05:00
PikalaxALT	75262c1920	Merge branch 'master' into bard_music	2017-11-02 00:09:14 -04:00
PikalaxALT	6543d7f2d6	Merge branch 'master' into heal_location	2017-11-01 23:43:08 -04:00
PikalaxALT	8a4f0287da	Merge branch 'master' into secret_base	2017-11-01 23:42:04 -04:00